Skip to content

Commit

Permalink
update deps (#46)
Browse files Browse the repository at this point in the history
  • Loading branch information
rscohn2 committed Aug 8, 2024
1 parent 3536a2f commit e441f7e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ env:

jobs:
checks:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.12'
- name: Install prerequisites
run: |
python -m pip install --quiet --upgrade pip
Expand All @@ -29,7 +29,7 @@ jobs:
pre-commit run --all
gcc:
runs-on: ubuntu-latst
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
Expand All @@ -38,16 +38,16 @@ jobs:
steps:
- name: CPUtype
run: lscpu
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.12'
- name: Install prerequisites
run: |
python -m pip install --quiet --upgrade pip
pip install --quiet -r requirements.txt
- name: Install spack
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ env.SPACK_REPO }}
path: spack
Expand All @@ -61,7 +61,7 @@ jobs:
run: |
source spack/share/spack/setup-env.sh
pytest -s tests/test_packages.py::test_load
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: gcc-${{ matrix.part }}-logs
Expand All @@ -74,7 +74,7 @@ jobs:
retention-days: 7

intel-compiler:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
Expand All @@ -84,16 +84,16 @@ jobs:
steps:
- name: CPUtype
run: lscpu
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.12'
- name: Install prerequisites
run: |
python -m pip install --quiet --upgrade pip
pip install --quiet -r requirements.txt
- name: Install spack
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ env.SPACK_REPO }}
path: spack
Expand All @@ -106,7 +106,7 @@ jobs:
spack clean --downloads
spack compiler add `spack location -i intel-oneapi-compilers`/compiler/latest/bin
pytest -s tests/test_packages.py::test_${{ matrix.compiler }}_${{ matrix.part }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: ${{ matrix.compiler }}-${{ matrix.part }}-logs
Expand Down
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

repos:
- repo: https://github.com/ambv/black
rev: 23.7.0
rev: 24.8.0
hooks:
- id: black
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.6.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -22,11 +22,11 @@ repos:
hooks:
- id: doc8
- repo: https://github.com/pycqa/flake8
rev: 6.0.0
rev: 7.1.1
hooks:
- id: flake8
- repo: https://github.com/pycqa/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort
- repo: https://github.com/pocc/pre-commit-hooks
Expand All @@ -35,6 +35,6 @@ repos:
- id: clang-format
args: [-i]
- repo: https://github.com/fsfe/reuse-tool
rev: v2.0.0
rev: v4.0.3
hooks:
- id: reuse
2 changes: 1 addition & 1 deletion tests/test_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def spack_install(options):
# checksums are not right because source is in this
# repo. fail-fast is needed to make spack return a non zero error
# code when a dependency fails
shell(f'spack --config-scope spack-config install --fail-fast {options}')
shell(f'spack install --fail-fast {options}')
# github actions have limited space, so delete cached downloads
if 'GITHUB_WORKFLOW' in os.environ:
shell('spack clean --downloads')
Expand Down

0 comments on commit e441f7e

Please sign in to comment.