Skip to content

Unpin GSD from version 1.7.0 #2321

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

Merged
richardjgowers merged 2 commits into from
Aug 9, 2019
Merged

Unpin GSD from version 1.7.0 #2321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a621ab1
Unpin GSD 1.7.0
IAlibay Aug 8, 2019
5c0d166
Revert "Pin gsd to v1.7.0"
IAlibay Aug 9, 2019
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
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ env:
- MAIN_CMD="pytest ${PYTEST_LIST}"
- SETUP_CMD="${PYTEST_FLAGS}"
- BUILD_CMD="pip install -e package/ && (cd testsuite/ && python setup.py build)"
# Temporarily pinning gsd to 1.7.0 (Issue #2317)
- CONDA_MIN_DEPENDENCIES="mmtf-python mock six biopython networkx cython joblib matplotlib scipy griddataformats hypothesis gsd=1.7.0 codecov"
- CONDA_MIN_DEPENDENCIES="mmtf-python mock six biopython networkx cython joblib matplotlib scipy griddataformats hypothesis gsd codecov"
- CONDA_DEPENDENCIES="${CONDA_MIN_DEPENDENCIES} seaborn>=0.7.0 clustalw=2.1 netcdf4 scikit-learn"
- CONDA_CHANNELS='biobuilds conda-forge'
- CONDA_CHANNEL_PRIORITY=True
Expand Down
6 changes: 1 addition & 5 deletions package/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,11 +559,7 @@ def dynamic_author_list():
'mock',
]
if not os.name == 'nt':
# GSD p2.7 support dropped in 1.8.0, temporarily pinning (#2317)
if sys.version_info[:2] == (2, 7):
install_requires.append('gsd>=1.4.0,<1.8.0')
else:
install_requires.append('gsd>=1.4.0')
install_requires.append('gsd>=1.4.0')

setup(name='MDAnalysis',
version=RELEASE,
Expand Down