From f66fa9ff74e4bd96ba0e7012ddfca5ad652de7c9 Mon Sep 17 00:00:00 2001
From: Jake VanderPlas <jakevdp@gmail.com>
Date: Fri, 18 Mar 2016 10:24:32 -0700
Subject: [PATCH 1/4] MAINT: tweak travis build script

---
 .travis.yml | 32 ++++++++++++++++++--------------
 MANIFEST.in |  4 +++-
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6d78a36..0cebf25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,22 +11,26 @@ python:
   - 3.5
 
 env:
-  - CONDA_DEPS="numpy scipy nose pip scikit-learn" PIP_DEPS="supersmoother astroML astroML_addons"
+  global:
+    - TEST_DIR=/tmp/megaman
+    - CONDA_DEPS="numpy scipy nose pip scikit-learn"
+    - PIP_DEPS="supersmoother astroML astroML_addons"
+
+before_install:
+    - export MINICONDA=$HOME/miniconda
+    - export PATH="$MINICONDA/bin:$PATH"
+    - hash -r
+    - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
+    - bash miniconda.sh -b -f -p $MINICONDA
+    - conda config --set always_yes yes
+    - conda update conda
+    - conda info -a
+    - conda install python=$TRAVIS_PYTHON_VERSION $CONDA_DEPS
+    - travis_retry pip install $PIP_DEPS
 
 install:
-  - conda create -n testenv --yes python=$TRAVIS_PYTHON_VERSION
-  - source activate testenv
-  - conda install --yes $CONDA_DEPS
-  - pip install $PIP_DEPS
   - python setup.py install
 
-before_install:
-  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
-  - chmod +x miniconda.sh
-  - ./miniconda.sh -b
-  - export PATH=/home/travis/miniconda3/bin:$PATH
-  # miniconda is not always up-to-date with conda.
-  - conda update --yes conda
-
 script:
-  - nosetests --with-doctest gatspy
+  - mkdir -p $TEST_DIR
+  - cd $TEST_DIR && nosetests -v --with-doctest --with-coverage --cover-package=gatspy gatspy
diff --git a/MANIFEST.in b/MANIFEST.in
index a7f0dc9..d004938 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,7 @@
 include *.md
 include *.py
 recursive-include gatspy *.py
+recursive-include doc *
+recursive-include examples *.ipynb
 include LICENSE
-include Makefile
\ No newline at end of file
+include Makefile

From 1dd1300674746d7c32fdc0747f6f981c54d4ed92 Mon Sep 17 00:00:00 2001
From: Jake VanderPlas <jakevdp@gmail.com>
Date: Fri, 18 Mar 2016 10:26:54 -0700
Subject: [PATCH 2/4] MAINT: remove python 2.6/3.3 support

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0cebf25..6654bfe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,7 @@ language: python
 sudo: false
 
 python:
-  - 2.6
   - 2.7
-  - 3.3
   - 3.4
   - 3.5
 

From 1bcf85eee48704174fc20df8c2992bbe78f0de94 Mon Sep 17 00:00:00 2001
From: Jake VanderPlas <jakevdp@gmail.com>
Date: Fri, 18 Mar 2016 10:28:59 -0700
Subject: [PATCH 3/4] MAINT: add coverage to dependencies

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

diff --git a/.travis.yml b/.travis.yml
index 6654bfe..3ff7815 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ python:
 env:
   global:
     - TEST_DIR=/tmp/megaman
-    - CONDA_DEPS="numpy scipy nose pip scikit-learn"
+    - CONDA_DEPS="numpy scipy nose pip coverage scikit-learn"
     - PIP_DEPS="supersmoother astroML astroML_addons"
 
 before_install:

From e2d779a28e8ac66a97159f2d475a8c7940114299 Mon Sep 17 00:00:00 2001
From: Jake VanderPlas <jakevdp@gmail.com>
Date: Fri, 18 Mar 2016 10:34:05 -0700
Subject: [PATCH 4/4] MAINT: remove Python 2.6/3.3 from README & setup.py

---
 CHANGES.md | 1 +
 README.md  | 2 +-
 setup.py   | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e31c71b..0ddf434 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,7 @@
 - Make ``supersmoother`` a soft dependency
 - New feature: ``gatspy.periodic.TrendedLombScargle`` extends ``LombScargle``
   by adding a linear trend parameter ``d*t`` to the fitted model
+- Fixed download URL for RR Lyrae datasets
 
 ## (v0.2.1) bugfix release (19 Aug 2015)
 
diff --git a/README.md b/README.md
index 3363321..d2f9b49 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ Gatspy uses ``nose`` for unit tests. With nosetests installed, type
 
 to run the unit tests.
 
-The tests are run on Python versions 2.6, 2.7, 3.3, 3.4, and 3.5.
+The tests are run on Python versions 2.7, 3.4, and 3.5.
 
 ## Authors
 - [Jake VanderPlas](http://www.vanderplas.com)
diff --git a/setup.py b/setup.py
index ce38f6e..1a09fbe 100644
--- a/setup.py
+++ b/setup.py
@@ -68,9 +68,7 @@ def version(path):
         'Intended Audience :: Science/Research',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5'],
      )