Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove hacks now that upstream has updated packages #868

Merged
merged 3 commits into from
Sep 17, 2021
Merged

Remove hacks now that upstream has updated packages #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46262ab
Remove hacks now that upstream has updated packages
mikemhenry Sep 14, 2021
2632812
Update meta.yaml
mikemhenry Sep 15, 2021
03d34be
Merge branch 'master' into feat/remove_ci_hacks
mikemhenry Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/CI.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ jobs:
#conda install --quiet -c conda-forge/label/openmm_rc openmm;;
nightly)
echo "Using OpenMM nightly dev build."
# need this until we cut a new openmoltools release
pip install git+https://github.com/choderalab/openmoltools.git
# need to install from master until parmed updates to a new release
pip install git+https://github.com/ParmEd/ParmEd.git
conda install --quiet -c omnia-dev openmm;;
esac

Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ requirements:
- numpy >=1.14
- scipy
- pymbar
- openmm >=7.5.0 # constraint slowdown has fixed https://github.com/openmm/openmm/pull/2818
- openmm >=7.6.0 # constraint slowdown has fixed https://github.com/openmm/openmm/pull/2818
- parmed
- openmoltools >=0.8.4
- openmmtools
Expand Down