From a621ab1c80bf5b072f081a271de82522846f7f6d Mon Sep 17 00:00:00 2001 From: Irfan Date: Thu, 8 Aug 2019 21:33:47 +0100 Subject: [PATCH 1/2] Unpin GSD 1.7.0 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1a4169b98d5..0701b764b5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 From 5c0d166339841bac272fd199b9b4595d6296ca6a Mon Sep 17 00:00:00 2001 From: Irfan Date: Fri, 9 Aug 2019 08:28:50 +0100 Subject: [PATCH 2/2] Revert "Pin gsd to v1.7.0" --- package/setup.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/setup.py b/package/setup.py index ed01b27a279..d0b7478a427 100755 --- a/package/setup.py +++ b/package/setup.py @@ -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,