From 2a56c125974343261580f1ef18471f92ad3f42cb Mon Sep 17 00:00:00 2001
From: Bansal Utkarsh <bansalutkarsh3@gmail.com>
Date: Thu, 13 Jul 2017 21:06:40 +0530
Subject: [PATCH] Get rid of nose

---
 .travis.yml | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2bac9adee56..7937dc00f8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,17 +22,12 @@ env:
     - BUILD_DOCS=false
     - PYTHON_VERSION=2.7
     - COVERALLS=false
-    - NOSE_FLAGS="--processes=2 --process-timeout=400 --no-open-files --with-timer --timer-top-n 50"
-    - NOSE_TEST_LIST="analysis"
     - PYTEST_FLAGS="--disable-pytest-warnings -n 2"
-    - PYTEST_LIST="testsuite/MDAnalysisTests/lib testsuite/MDAnalysisTests/formats testsuite/MDAnalysisTests/coordinates testsuite/MDAnalysisTests/utils testsuite/MDAnalysisTests/topology testsuite/MDAnalysisTests/auxiliary testsuite/MDAnalysisTests/core"
-    - NOSE_COVERAGE_FILE="nose_coverage"
-    - PYTEST_COVERAGE_FILE="pytest_coverage"
-    - MAIN_CMD="pytest ${PYTEST_LIST} ${PYTEST_FLAGS}; python ./testsuite/MDAnalysisTests/mda_nosetests ${NOSE_TEST_LIST} ${NOSE_FLAGS}"
+    - MAIN_CMD="pytest testsuite/MDAnalysisTests/ ${PYTEST_FLAGS}"
     - SETUP_CMD=""
     - BUILD_CMD="pip install -v package/ && pip install testsuite/"
-    - CONDA_DEPENDENCIES="mmtf-python nose=1.3.7 mock six biopython networkx cython joblib nose-timer matplotlib scipy griddataformats pytest-cov pytest-xdist hypothesis"
-    - CONDA_ALL_DEPENDENCIES="mmtf-python nose=1.3.7 mock six biopython networkx cython joblib nose-timer matplotlib netcdf4 scikit-learn scipy griddataformats seaborn coveralls clustalw=2.1 pytest-cov pytest-xdist hypothesis"
+    - CONDA_DEPENDENCIES="mmtf-python mock six biopython networkx cython joblib nose-timer matplotlib scipy griddataformats pytest-cov pytest-xdist hypothesis"
+    - CONDA_ALL_DEPENDENCIES="mmtf-python mock six biopython networkx cython joblib nose-timer matplotlib netcdf4 scikit-learn scipy griddataformats seaborn coveralls clustalw=2.1 pytest-cov pytest-xdist hypothesis"
     # Install griddataformats from PIP so that scipy is only installed in the full build (#1147)
     - PIP_DEPENDENCIES='pytest-raises'
     - CONDA_CHANNELS='biobuilds conda-forge'
@@ -47,8 +42,6 @@ matrix:
     - os : linux
       env: NAME='minimal'
            PYTHON_VERSION=2.7
-           MEMLEAK='--with-memleak'
-           MAIN_CMD='pytest ${PYTEST_LIST} ${PYTEST_FLAGS}; python ./testsuite/MDAnalysisTests/mda_nosetests ${NOSE_TEST_LIST} ${NOSE_FLAGS} ${MEMLEAK}'
 
     - os: linux
       env: NAME="Doc"
@@ -67,9 +60,7 @@ matrix:
 
     - os: linux
       env: NAME='full'
-           NOSE_COVERAGE='--with-coverage --cover-package MDAnalysis'
-           PYTEST_COVERAGE='--cov=MDAnalysis'
-           MAIN_CMD='export COVERAGE_FILE=$PYTEST_COVERAGE_FILE; pytest ${PYTEST_LIST} ${PYTEST_FLAGS} ${PYTEST_COVERAGE}; export COVERAGE_FILE=$NOSE_COVERAGE_FILE; python ./testsuite/MDAnalysisTests/mda_nosetests ${NOSE_TEST_LIST} ${NOSE_FLAGS} ${NOSE_COVERAGE}'
+           MAIN_CMD='${MAIN_CMD} --cov=MDAnalysis'
            CONDA_DEPENDENCIES=${CONDA_ALL_DEPENDENCIES}
            COVERALLS='true'
 
@@ -110,7 +101,6 @@ script:
 after_success:
   - |
     if [[ $COVERALLS == 'true' ]]; then \
-      coverage combine $NOSE_COVERAGE_FILE $PYTEST_COVERAGE_FILE; \
       coveralls; \
     fi
   # can't use test here since this leads to travis fails even though the build passes