From c3a0abdb33c802c958874adfe116840a46076c81 Mon Sep 17 00:00:00 2001
From: Richard Gowers <richardjgowers@gmail.com>
Date: Wed, 19 Jul 2017 01:09:15 +0100
Subject: [PATCH 1/2] Made python 3 support official

---
 .travis.yml       | 12 +++++++++---
 package/CHANGELOG |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1f8f1b5ccc7..508f7b3648c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,15 +89,21 @@ matrix:
            EVENT_TYPE='cron'
 
     - os: linux
-      env: NAME='full-py3.6'
-           PYTHON_VERSION=3.6
+      env: NAME='full-py3.4'
+           PYTHON_VERSION=3.4
            CONDA_DEPENDENCIES=${CONDA_ALL_DEPENDENCIES}
-  allow_failures:
+
+    - os: linux
+      env: NAME='full-py3.5'
+           PYTHON_VERSION=3.5
+           CONDA_DEPENDENCIES=${CONDA_ALL_DEPENDENCIES}
+
     - os: linux
       env: NAME='full-py3.6'
            PYTHON_VERSION=3.6
            CONDA_DEPENDENCIES=${CONDA_ALL_DEPENDENCIES}
 
+
 install:
   - git clone git://github.com/astropy/ci-helpers.git
   - source ci-helpers/travis/setup_conda.sh
diff --git a/package/CHANGELOG b/package/CHANGELOG
index bd0bfade357..fde9749de9e 100644
--- a/package/CHANGELOG
+++ b/package/CHANGELOG
@@ -19,6 +19,7 @@ mm/dd/17 richardjgowers, rathann, orbeckst, tylerjereddy, mtiberti, kain88-de,
   * 0.17.0
 
 Enhancements
+  * Python versions 3.4 and upwards are now supported (Issue #260)
   * add low level lib.formats.libdcd module for reading/writing DCD (PR #1372)
   * replace old DCD reader with a Python 3 ready DCD reader (Issue #659)
 

From 1208eb1351f1dce02ce1d23a578342e428c4ed63 Mon Sep 17 00:00:00 2001
From: Richard Gowers <richardjgowers@gmail.com>
Date: Wed, 19 Jul 2017 18:07:24 +0100
Subject: [PATCH 2/2] removed pytest xdist

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 508f7b3648c..beea872e3f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ env:
     - COVERALLS=false
     - NOSE_FLAGS="--processes=2 --process-timeout=400 --no-open-files --with-timer --timer-top-n 50"
     - NOSE_TEST_LIST=""
-    - PYTEST_FLAGS="--disable-pytest-warnings --numprocesses 2 --durations=50"
+    - PYTEST_FLAGS="--disable-pytest-warnings --durations=50"
     - PYTEST_LIST="testsuite/MDAnalysisTests/lib testsuite/MDAnalysisTests/formats testsuite/MDAnalysisTests/coordinates testsuite/MDAnalysisTests/utils testsuite/MDAnalysisTests/topology testsuite/MDAnalysisTests/auxiliary testsuite/MDAnalysisTests/core testsuite/MDAnalysisTests/analysis"
     - NOSE_COVERAGE_FILE="nose_coverage"
     - PYTEST_COVERAGE_FILE="pytest_coverage"