Skip to content

Commit 20f568c

Browse files
authored
Merge pull request #39 from calpolyccg/development
Merge 2.0.0
2 parents 6aa3335 + 9b4ab45 commit 20f568c

Some content is hidden

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

50 files changed

+10732
-768
lines changed

.github/workflows/CI.yaml

+32-10
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,16 @@ jobs:
5050
auto-update-conda: false
5151
auto-activate-base: false
5252
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
53+
54+
# TODO: make pyright happier someday in the future
55+
# - name: Type-check
56+
# shell: bash -l {0}
57+
# run: |
58+
# pyright mdsapt
5359

54-
- name: Install MDSAPT package
55-
# conda setup requires this special shell
56-
shell: bash -l {0}
57-
run: |
58-
python -m pip install . --no-deps
59-
conda list
60-
61-
# TODO: possibly integrate this step with meta.yml?
6260
- name: Run tests
63-
# conda setup requires this special shell
6461
shell: bash -l {0}
6562
run: |
66-
pip install pytest-cov
6763
pytest -v ./mdsapt --cov=mdsapt --cov-report=xml
6864
6965
- name: Upload CodeCov
@@ -73,6 +69,12 @@ jobs:
7369
flags: unittests
7470
name: codecov-${{ matrix.os }}-py${{ matrix.python-version }}
7571

72+
- name: Install MDSAPT package
73+
shell: bash -l {0}
74+
run: |
75+
python -m pip install . --no-deps
76+
conda list
77+
7678
package:
7779
name: Packaging py${{ matrix.python-version }}/${{ matrix.os }}
7880
runs-on: ${{ matrix.os }}
@@ -162,3 +164,23 @@ jobs:
162164
shell: bash -l {0}
163165
run: >
164166
python3 -c "import mdsapt"
167+
168+
lint-and-format:
169+
# These checks are much faster and don't actually need to install any packages.
170+
name: Run fast checks over code
171+
runs-on: ubuntu-latest
172+
173+
steps:
174+
- uses: actions/checkout@v2
175+
176+
- name: Install formatter and linter
177+
run: |
178+
pip install autopep8 pylint
179+
180+
- name: Lint code
181+
run: |
182+
pylint --fail-under=9.5 --disable=E,R mdsapt
183+
184+
- name: Ensure formatting
185+
run: |
186+
autopep8 -r mdsapt --diff --exit-code

.gitignore

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# generated files
2+
psi.*.clean
3+
out.csv
4+
/timer.dat
5+
/resid_fixed.pdb
6+
/resid.pdb
7+
/*.out
8+
/sapt_test.csv
9+
110
# Byte-compiled / optimized / DLL files
211
__pycache__/
312
*.py[cod]
@@ -104,3 +113,7 @@ ENV/
104113
# profraw files from LLVM? Unclear exactly what triggers this
105114
# There are reports this comes from LLVM profiling, but also Xcode 9.
106115
*profraw
116+
117+
# MDSAPT-generated files
118+
timer.dat
119+
input.yaml

0 commit comments

Comments
 (0)