From 071b97ad88545f33cdbeede903ff156646bd8618 Mon Sep 17 00:00:00 2001
From: Matthew Newville <newville@cars.uchicago.edu>
Date: Mon, 29 May 2017 21:28:41 -0500
Subject: [PATCH] update asv conf

---
 asv_benchmarking/asv.conf.json | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/asv_benchmarking/asv.conf.json b/asv_benchmarking/asv.conf.json
index 3eb01af5b..e4299e6c6 100644
--- a/asv_benchmarking/asv.conf.json
+++ b/asv_benchmarking/asv.conf.json
@@ -15,7 +15,7 @@
 
     // List of branches to benchmark. If not provided, defaults to "master"
     // (for git) or "tip" (for mercurial).
-    "branches": ["master", "prep094rc2"], // for git
+    "branches": ["master"], // for git
     // "branches": ["tip"],    // for mercurial
 
     // The DVCS being used.  If not set, it will be automatically
@@ -36,15 +36,17 @@
 
     // The Pythons you'd like to test against.  If not provided, defaults
     // to the current version of Python used to run `asv`.
-    "pythons": ["2.7", "3.5"],
+    "pythons": ["2.7", "3.6"],
 
     // The matrix of dependencies to test.  Each key is the name of a
     // package (in PyPI) and the values are version numbers.  An empty
     // list indicates to just test against the default (latest)
     // version.
-    // "matrix": {
-    //	"pip+emcee": [],
-    // },
+    "matrix": {
+	"pip+emcee": [""],
+	"scipy": ["0.18", "0.19"],
+	"six": ["1.10.0"],
+    },
 
     // The directory (relative to the current directory) that benchmarks are
     // stored in.  If not provided, defaults to "benchmarks"