Skip to content

Commit

Permalink
Merge branch 'develop' into feature/experimental-diff
Browse files Browse the repository at this point in the history
  • Loading branch information
pearce8 authored Nov 26, 2024
2 parents cec1cd2 + f359d5c commit a7b2b3b
Show file tree
Hide file tree
Showing 292 changed files with 11,308 additions and 2,002 deletions.
10 changes: 10 additions & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#------------------------------------------------------------------------
# Load Development Spack Environment (If Spack is installed.)
#
# Run 'direnv allow' from within the cloned repository to automatically
# load the spack environment when you enter the directory.
#------------------------------------------------------------------------
if type spack &>/dev/null; then
. $SPACK_ROOT/share/spack/setup-env.sh
spack env activate -d .
fi
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ configs:
- changed-files:
- any-glob-to-any-file:
- configs/**
- var/sys_repo/**

dependencies:
- changed-files:
Expand All @@ -24,8 +25,10 @@ docs:
- any-glob-to-any-file:
- docs/**
- README.rst
- tags.yaml

experiment:
- changed-files:
- any-glob-to-any-file:
- experiments/**
- var/exp_repo/**
4 changes: 2 additions & 2 deletions .github/workflows/bin/license
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ def list_files(root):
SPDX_MISMATCH, GENERAL_MISMATCH, COPYRIGHT_YEAR_MISMATCH = range(1, 4)

#: Latest year that copyright applies. UPDATE THIS when bumping copyright.
latest_year = 2023
latest_year = "202[34]"
strict_date = r"Copyright %s" % latest_year

#: regexes for valid license lines at tops of files
license_line_regexes = [
r"Copyright (%d|[0-9]{4}) Lawrence Livermore National Security, LLC and other"
r"Copyright (%s|[0-9]{4}) Lawrence Livermore National Security, LLC and other"
% latest_year,
r"Benchpark Project Developers. See the top-level COPYRIGHT file for details.",
r"SPDX-License-Identifier: Apache-2.0",
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
license: ${{ steps.filter.outputs.license }}

steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # @v2
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # @v2
if: ${{ github.event_name == 'push' }}
with:
fetch-depth: 0
Expand All @@ -40,28 +40,37 @@ jobs:
- 'docs/**'
- 'experiments/**'
- 'repo/**'
- 'var/**'
- 'README.rst'
- 'tags.yaml'
- 'lib/**'
style:
- '.github/**'
- 'bin/**'
- 'configs/**'
- 'docs/conf.py'
- 'experiments/**'
- 'repo/**'
- 'var/**'
- 'lib/**'
run:
- '.github/**'
- 'bin/**'
- 'configs/**'
- 'checkout-versions.yaml'
- 'experiments/**'
- 'repo/**'
- 'var/**'
- 'lib/**'
license:
- '.github/**'
- 'bin/**'
- 'configs/**'
- 'docs/**'
- 'experiments/**'
- 'repo/**'
- 'var/**'
- 'lib/**'
docs:
if: ${{ needs.changes.outputs.docs == 'true' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

- name: Setup Python
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
with:
python-version: '3.11'
cache: 'pip'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/license.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ jobs:
verify-license:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

- name: Set up Python 3.11
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
with:
python-version: '3.11'
cache: 'pip'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# docs
sphinx==7.3.7
sphinx-rtd-theme==2.0.0
sphinx==8.1.3
sphinx-rtd-theme==3.0.2
codespell==2.3.0
pandas==2.2.2
pyyaml==6.0.1
pandas==2.2.3
pyyaml==6.0.2
sphinxcontrib-programoutput==0.17
# The remaining requirements are from Ramble
pytest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/requirements/style.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
black==24.4.2
flake8==7.0.0
black==24.10.0
flake8==7.1.1
isort==5.13.2
codespell==2.3.0
Loading

0 comments on commit a7b2b3b

Please sign in to comment.