From c817a2b162a6cbcfc4c9c747caeab64f8fc03ad9 Mon Sep 17 00:00:00 2001
From: Mainak Jas <mainakjas@gmail.com>
Date: Wed, 29 Mar 2017 12:59:56 -0400
Subject: [PATCH] Try more more

---
 circle.yml  | 35 +++++++++++++++++++++++++++++------
 doc/conf.py | 10 ----------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/circle.yml b/circle.yml
index 6e32cd2..730a8a1 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,14 +1,37 @@
+machine:
+  environment:
+    # We need to set this variable to let Anaconda take precedence
+    PATH: "/home/ubuntu/miniconda/envs/circleenv/bin:/home/ubuntu/miniconda/bin:$PATH"
+    DISPLAY: ":99.0"
+
 dependencies:
   cache_directories:
     - "~/spykes_data"
+    - "~/miniconda"
+  # Various dependencies
+  pre:
+    # Get a running Python
+    - cd ~;
+    # Disable pyenv (no cleaner way provided by CircleCI as it prepends pyenv version to PATH)
+    - rm -rf ~/.pyenv;
+    - rm -rf ~/virtualenvs;
+    # Get Anaconda and conda-based requirements
+    - >
+      if [ ! -d "/home/ubuntu/miniconda" ]; then
+        echo "Setting up conda";
+        wget -q http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O ~/miniconda.sh;
+        chmod +x ~/miniconda.sh;
+        ~/miniconda.sh -b -p /home/ubuntu/miniconda;
+        conda update --yes --quiet conda;
+        conda create -n circleenv --yes pip python=2.7 pip;
+        sed -i "s/ENABLE_USER_SITE = .*/ENABLE_USER_SITE = False/g" /home/ubuntu/miniconda/envs/circleenv/lib/python2.7/site.py;
+      else
+        echo "Conda already set up.";
+      fi
+    - conda install -n circleenv --yes numpy scipy scikit-learn matplotlib sphinx pillow six IPython pandas;
   override:
-    - sudo apt-get install python3-tk
-    - pip install --upgrade pip
-    - pip install sphinx matplotlib coverage
+    - pip install sphinx coverage
     - pip install sphinx-gallery sphinx_bootstrap_theme
-    - pip install scipy
-    - pip install scikit-learn
-    - pip install pandas
     - pip install -e .
     # we need to do this here so the datasets will be cached
     # pipefail is necessary to propagate exit codes
diff --git a/doc/conf.py b/doc/conf.py
index ae393c5..dbe8fc8 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -14,12 +14,6 @@
 
 import sys
 import os
-import sphinx
-import spykes.neurovis
-import spykes.neuropop
-import spykes.popvis
-import sphinx_gallery
-import matplotlib
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -72,10 +66,6 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-# The short X.Y version.
-version = spykes.__version__
-# The full version, including alpha/beta/rc tags.
-release = spykes.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.