Merge core refactor into v1.0 feature branch (#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]>
CrayLabs · Oct 28, 2024 · 5bdafc5 · 5bdafc5
1 parent 8a19dee
commit 5bdafc5
Show file tree

Hide file tree

Showing 361 changed files with 20,117 additions and 13,550 deletions.
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -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: |
@@ -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

diff --git a/.pylintrc b/.pylintrc
@@ -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.

diff --git a/Makefile b/Makefile
@@ -164,22 +164,22 @@ tutorials-prod:
 # help: test                           - Run all tests
 .PHONY: test
 test:
-	@python -m pytest --ignore=tests/full_wlm/ --ignore=tests/dragon
+	@python -m pytest --ignore=tests/full_wlm/ --ignore=tests/dragon_wlm
 
 # help: test-verbose                   - Run all tests verbosely
 .PHONY: test-verbose
 test-verbose:
-	@python -m pytest -vv --ignore=tests/full_wlm/ --ignore=tests/dragon
+	@python -m pytest -vv --ignore=tests/full_wlm/ --ignore=tests/dragon_wlm
 
 # help: test-debug                     - Run all tests with debug output
 .PHONY: test-debug
 test-debug:
-	@SMARTSIM_LOG_LEVEL=developer python -m pytest -s -o log_cli=true -vv --ignore=tests/full_wlm/ --ignore=tests/dragon
+	@SMARTSIM_LOG_LEVEL=developer python -m pytest -s -o log_cli=true -vv --ignore=tests/full_wlm/ --ignore=tests/dragon_wlm
 
 # help: test-cov                       - Run all tests with coverage
 .PHONY: test-cov
 test-cov:
-	@python -m pytest -vv --cov=./smartsim --cov-config=${COV_FILE} --ignore=tests/full_wlm/ --ignore=tests/dragon
+	@python -m pytest -vv --cov=./smartsim --cov-config=${COV_FILE} --ignore=tests/full_wlm/ --ignore=tests/dragon_wlm
 
 
 # help: test-full                      - Run all WLM tests with Python coverage (full test suite)
@@ -196,4 +196,4 @@ test-wlm:
 # help: test-dragon                   - Run dragon-specific tests
 .PHONY: test-dragon
 test-dragon:
-	@dragon pytest tests/dragon
+	@dragon pytest tests/dragon_wlm