From dd888675b16c66319535a7b3ebb07f99e8d73884 Mon Sep 17 00:00:00 2001
From: Oliver Beckstein <orbeckst@gmail.com>
Date: Tue, 30 Oct 2018 18:11:27 -0700
Subject: [PATCH] bumped MDAnalysis requirement to 0.19.0

- install conda package of MDA on travis
- require MDA and MDATests >= 0.19.0
---
 .travis.yml | 5 +++--
 setup.py    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 76690594..7c292b18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,13 +19,14 @@ env:
     # mdanalysis develop from source (see below), which needs
     # minimal CONDA_MDANALYSIS_DEPENDENCIES
     #- CONDA_DEPENDENCIES="mdanalysis mdanalysistests dask joblib pytest-pep8 mock codecov cython hypothesis sphinx"
-    - CONDA_MDANALYSIS_DEPENDENCIES="cython mmtf-python six biopython networkx scipy griddataformats gsd hypothesis"
+    #- CONDA_MDANALYSIS_DEPENDENCIES="cython mmtf-python six biopython networkx scipy griddataformats gsd hypothesis"
+    - CONDA_MDANALYSIS_DEPENDENCIES="mdanalysis mdanalysistests"
     - CONDA_DEPENDENCIES="${CONDA_MDANALYSIS_DEPENDENCIES} dask distributed joblib pytest-pep8 mock codecov"
     - CONDA_CHANNELS='conda-forge'
     - CONDA_CHANNEL_PRIORITY=True
     # install development version of MDAnalysis (needed until the test
     # files for analysis.rdf are available in release 0.19.0)
-    - PIP_DEPENDENCIES="git+https://github.com/MDAnalysis/mdanalysis#egg=mdanalysis&subdirectory=package git+https://github.com/MDAnalysis/mdanalysis#egg=mdanalysistests&subdirectory=testsuite"
+    #- PIP_DEPENDENCIES="git+https://github.com/MDAnalysis/mdanalysis#egg=mdanalysis&subdirectory=package git+https://github.com/MDAnalysis/mdanalysis#egg=mdanalysistests&subdirectory=testsuite"
     - NUMPY_VERSION=stable
     - BUILD_CMD='python setup.py develop'
     - CODECOV=false
diff --git a/setup.py b/setup.py
index 4ffe4d72..efb15188 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@
     },
     packages=find_packages(),
     install_requires=[
-        'MDAnalysis>=0.18',
+        'MDAnalysis>=0.19.0',
         'dask>=0.18',
         'distributed',
         'six',
@@ -58,5 +58,5 @@
     ],
     tests_require=[
         'pytest',
-        'MDAnalysisTests>=0.18',  # keep
+        'MDAnalysisTests>=0.19.0',  # keep
     ], )