Skip to content

Commit 5bdafc5

Browse files
ankonaamandarichardsonnMattToastjuliaputkoAlyssaCote
authored
Merge core refactor into v1.0 feature branch (CrayLabs#756)
Combine the `core-refactor` feature branch with `mli-feature` in `v1.0` branch --------- Co-authored-by: Amanda Richardson <[email protected]> Co-authored-by: Amanda Richardson <[email protected]> Co-authored-by: Matt Drozt <[email protected]> Co-authored-by: Julia Putko <[email protected]> Co-authored-by: amandarichardsonn <[email protected]> Co-authored-by: Alyssa Cote <[email protected]> Co-authored-by: Al Rigazzi <[email protected]> Co-authored-by: Julia Putko <[email protected]> Co-authored-by: Matt Drozt <[email protected]>
1 parent 8a19dee commit 5bdafc5

File tree

361 files changed

+20117
-13550
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

361 files changed

+20117
-13550
lines changed

.github/workflows/run_tests.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ jobs:
6969
with:
7070
python-version: ${{ matrix.py_v }}
7171

72+
- name: Check Test Files are Marked
73+
run: |
74+
diff <(find tests -path tests/_legacy -prune -o -type f -name 'test_*.py' -print \
75+
| xargs grep -l 'pytestmark' \
76+
| sort) \
77+
<(find tests -path tests/_legacy -prune -o -type f -name 'test_*.py' -print \
78+
| sort)
79+
7280
- name: Install build-essentials for Ubuntu
7381
if: contains( matrix.os, 'ubuntu' )
7482
run: |
@@ -131,8 +139,9 @@ jobs:
131139
run: |
132140
make check-mypy
133141
134-
- name: Run Pylint
135-
run: make check-lint
142+
# TODO: Re-enable static analysis once API is firmed up
143+
# - name: Run Pylint
144+
# run: make check-lint
136145

137146
# Run isort/black style check
138147
- name: Run isort

.pylintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ max-module-lines=1000
167167

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

172172
# Allow the body of an if to be on the same line as the test if there is no
173173
# else.

Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -164,22 +164,22 @@ tutorials-prod:
164164
# help: test - Run all tests
165165
.PHONY: test
166166
test:
167-
@python -m pytest --ignore=tests/full_wlm/ --ignore=tests/dragon
167+
@python -m pytest --ignore=tests/full_wlm/ --ignore=tests/dragon_wlm
168168

169169
# help: test-verbose - Run all tests verbosely
170170
.PHONY: test-verbose
171171
test-verbose:
172-
@python -m pytest -vv --ignore=tests/full_wlm/ --ignore=tests/dragon
172+
@python -m pytest -vv --ignore=tests/full_wlm/ --ignore=tests/dragon_wlm
173173

174174
# help: test-debug - Run all tests with debug output
175175
.PHONY: test-debug
176176
test-debug:
177-
@SMARTSIM_LOG_LEVEL=developer python -m pytest -s -o log_cli=true -vv --ignore=tests/full_wlm/ --ignore=tests/dragon
177+
@SMARTSIM_LOG_LEVEL=developer python -m pytest -s -o log_cli=true -vv --ignore=tests/full_wlm/ --ignore=tests/dragon_wlm
178178

179179
# help: test-cov - Run all tests with coverage
180180
.PHONY: test-cov
181181
test-cov:
182-
@python -m pytest -vv --cov=./smartsim --cov-config=${COV_FILE} --ignore=tests/full_wlm/ --ignore=tests/dragon
182+
@python -m pytest -vv --cov=./smartsim --cov-config=${COV_FILE} --ignore=tests/full_wlm/ --ignore=tests/dragon_wlm
183183

184184

185185
# help: test-full - Run all WLM tests with Python coverage (full test suite)
@@ -196,4 +196,4 @@ test-wlm:
196196
# help: test-dragon - Run dragon-specific tests
197197
.PHONY: test-dragon
198198
test-dragon:
199-
@dragon pytest tests/dragon
199+
@dragon pytest tests/dragon_wlm

0 commit comments

Comments
 (0)