Skip to content

Commit

Permalink
Merge branch 'ssr-merge' into mli-merge
Browse files Browse the repository at this point in the history
  • Loading branch information
ankona committed Oct 17, 2024
2 parents 6e49f97 + 2cbd3be commit e33646b
Show file tree
Hide file tree
Showing 317 changed files with 19,175 additions and 12,144 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ on:
push:
branches:
- develop
branches-ignore:
- smartsim-refactor

jobs:
build_docs:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ name: enforce_changelog

on:
pull_request:
branches-ignore:
- smartsim-refactor
push:
branches:
- develop
Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ jobs:
with:
python-version: ${{ matrix.py_v }}

- name: Check Test Files are Marked
run: |
diff <(find tests -path tests/_legacy -prune -o -type f -name 'test_*.py' -print \
| xargs grep -l 'pytestmark' \
| sort) \
<(find tests -path tests/_legacy -prune -o -type f -name 'test_*.py' -print \
| sort)
- name: Install build-essentials for Ubuntu
if: contains( matrix.os, 'ubuntu' )
run: |
Expand Down Expand Up @@ -131,8 +139,9 @@ jobs:
run: |
make check-mypy
- name: Run Pylint
run: make check-lint
# TODO: Re-enable static analysis once API is firmed up
# - name: Run Pylint
# run: make check-lint

# Run isort/black style check
- name: Run isort
Expand Down Expand Up @@ -163,7 +172,7 @@ jobs:
run: |
echo "SMARTSIM_LOG_LEVEL=debug" >> $GITHUB_ENV
py.test -s --import-mode=importlib -o log_cli=true --cov=$(smart site) --cov-report=xml --cov-config=./tests/test_configs/cov/local_cov.cfg --ignore=tests/full_wlm/ -m ${{ matrix.subset }} ./tests
# Upload artifacts on failure, ignoring binary files
- name: Upload Artifact
if: failure()
Expand Down
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ max-module-lines=1000

# Allow the body of a class to be on the same line as the declaration if body
# contains single statement.
single-line-class-stmt=no
single-line-class-stmt=yes

# Allow the body of an if to be on the same line as the test if there is no
# else.
Expand Down
Loading

0 comments on commit e33646b

Please sign in to comment.