Skip to content

Commit

Permalink
Merge branch 'aiidateam:main' into docker-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
danielhollas authored May 13, 2024
2 parents e64965a + fb9b6cc commit afe8448
Show file tree
Hide file tree
Showing 40 changed files with 21,302 additions and 174 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/ci-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,12 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install system dependencies
# note libkrb5-dev is required as a dependency for the gssapi pip install
run: |
sudo apt update
sudo apt install libkrb5-dev ruby ruby-dev
- name: Install python dependencies
uses: ./.github/actions/install-aiida-core
with:
python-version: '3.10'
python-version: '3.11'
extras: '[pre-commit]'
from-requirements: 'true'
from-requirements: 'false'

- name: Run pre-commit
run: pre-commit run --all-files || ( git status --short ; git diff ; exit 1 )
4 changes: 4 additions & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ jobs:
ports:
- 5672:5672
- 15672:15672
slurm:
image: xenonmiddleware/slurm:17
ports:
- 5001:22

steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: check-merge-conflict
- id: check-yaml
Expand Down Expand Up @@ -37,7 +37,7 @@ repos:
args: [--line-length=120, --fail-on-change]

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.3.5
rev: v0.4.1
hooks:
- id: ruff-format
exclude: &exclude_ruff >
Expand All @@ -50,7 +50,7 @@ repos:
args: [--fix, --exit-non-zero-on-fix, --show-fixes]

- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
rev: v2.12.0
rev: v2.13.0
hooks:
- id: pretty-format-toml
args: [--autofix]
Expand Down
Binary file added docs/source/_static/cheatsheet_h.pdf
Binary file not shown.
Binary file added docs/source/intro/_cheatsheet/cheatsheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit afe8448

Please sign in to comment.