Skip to content

Commit

Permalink
Merge pull request #126 from cbc-univie/drude_dev
Browse files Browse the repository at this point in the history
handling of drude force field
JohannesKarwou authored Jun 5, 2024
2 parents 5688467 + 68ae85a commit 6212fd3
Showing 13 changed files with 9,954 additions and 479 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Apply override to all files in the directory (source: https://github.com/github/linguist/blob/master/docs/overrides.md)
data/** linguist-vendored
transformato/toppar/** linguist-vendored
transformato/_version.py export-subst
6 changes: 2 additions & 4 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
@@ -6,12 +6,10 @@ on:
# Both are tracked here to keep legacy and new codes working
push:
branches:
- "master"
- "main"
- '**'
pull_request:
branches:
- "master"
- "main"
- '**'
schedule:
# Nightly tests run on master by default:
# Scheduled workflows run on the latest commit on the default or base branch.
2 changes: 1 addition & 1 deletion devtools/conda-envs/fep_env.yaml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ dependencies:
- openmmtools
- numpy
- ipython
- pymbar
- pymbar=3
- rdkit
- parmed
- pyyaml
7 changes: 7 additions & 0 deletions transformato/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"python.testing.pytestArgs": [
"."
],
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true
}
Loading

0 comments on commit 6212fd3

Please sign in to comment.