Skip to content

Commit

Permalink
Merge branch 'main' into qcarchive_update
Browse files Browse the repository at this point in the history
  • Loading branch information
mikemhenry authored Oct 8, 2024
2 parents 3f32536 + dd0bf1a commit 3a3700c
Show file tree
Hide file tree
Showing 6 changed files with 1,092 additions and 521 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.ipynb linguist-documentation
*.html linguist-documentation
espaloma/_version.py export-subst
4 changes: 2 additions & 2 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:

defaults:
run:
shell: bash -l {0}
shell: bash -leo pipefail {0}

jobs:
test:
Expand All @@ -31,9 +31,9 @@ jobs:
matrix:
os: ['ubuntu','macos']
python-version:
- "3.12"
- "3.11"
- "3.10"
- "3.9"

env:
OPENMM: ${{ matrix.cfg.openmm }}
Expand Down
6 changes: 3 additions & 3 deletions devtools/conda-envs/espaloma.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ dependencies:
- openmmforcefields >=0.11.2
- tqdm
- pydantic <2 # We need our deps to fix this
- dgl =1.1.2
- qcportal>=0.5
- qcportal >=0.50
- dgl =2.3.0
# Testing
- pytest
- pytest-cov
Expand All @@ -31,4 +31,4 @@ dependencies:
- nose-timer
- coverage
- sphinx
- sphinx_rtd_theme
- sphinx_rtd_theme
3 changes: 3 additions & 0 deletions espaloma/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@
__version__ = versions["version"]
__git_revision__ = versions["full-revisionid"]
del get_versions, versions

from . import _version
__version__ = _version.get_versions()['version']
Loading

0 comments on commit 3a3700c

Please sign in to comment.