Merge branch 'master' into release

TerrainBento · Sep 2, 2019 · aced3aa · aced3aa
2 parents 1b1b2c5 + 74888e4
commit aced3aa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,8 +8,7 @@ env:
   - CONDA_ENV=3.6
   global:
   - MPLBACKEND=Agg
-  - PYPI_PASS:
-      secure: JPEQfViEt1HJ4G1jAahCf1epqwvFqiH2VMNJkLmf/KGBouWQVM/dUXKAybueRFK8MFgblx1WXFo9usJDxugF4Gok4FVKd3h7qRfREVfJwmZ/Cul3z9Lq61cIpSicPsaRWKB8jks1B+oGolWnY0C4Mq6vNewcWmZ/5OTfqEGt+6qMVFBFep2iHnNn556v4YKvjeVoYhl4nZIYXXnQ7TpWRAL2tLvxe65VEn9EOfgpDmpnTKbKeBtWE2yxFKruTGB194CbHnDaw1Rkp90No6KFqzq5l5kksAvtS7YYjoPRlPP8PzUcprymPwakANQ5kSr66fkaWCXApbVU8VUE+MPDR0YKtVmw0TJWKipCzkQOtginE/ZAcD326VHKPho+nRBfWGwxr4rnc303dSmwYKL1x+sowCaMuS74cARPhQRMxQDT2FpBglKazjeqX4euvG/IMGc7YQVdSDkxnNGO5+1GsAVN4Xfd/3tI2NgvMg0FVdD3rKJLEWb912wTwl4mm2dm2mMU3YvYrFVRvNtNZPNNJGlVtf93pNKxyyCDdFDfs4kh2tbrVfSin3Ku5s/qxtcjGeYGbEETbUUoBlQSemYiNrgbv+fn+snr+x7q1kV49vE+C5pxjtaaAnCp+oxWuzpXGwDvwthIT/3U6P5R6HE8l49FABGHOeX8PJcC2TJ8ZcI=
+  - secure: JPEQfViEt1HJ4G1jAahCf1epqwvFqiH2VMNJkLmf/KGBouWQVM/dUXKAybueRFK8MFgblx1WXFo9usJDxugF4Gok4FVKd3h7qRfREVfJwmZ/Cul3z9Lq61cIpSicPsaRWKB8jks1B+oGolWnY0C4Mq6vNewcWmZ/5OTfqEGt+6qMVFBFep2iHnNn556v4YKvjeVoYhl4nZIYXXnQ7TpWRAL2tLvxe65VEn9EOfgpDmpnTKbKeBtWE2yxFKruTGB194CbHnDaw1Rkp90No6KFqzq5l5kksAvtS7YYjoPRlPP8PzUcprymPwakANQ5kSr66fkaWCXApbVU8VUE+MPDR0YKtVmw0TJWKipCzkQOtginE/ZAcD326VHKPho+nRBfWGwxr4rnc303dSmwYKL1x+sowCaMuS74cARPhQRMxQDT2FpBglKazjeqX4euvG/IMGc7YQVdSDkxnNGO5+1GsAVN4Xfd/3tI2NgvMg0FVdD3rKJLEWb912wTwl4mm2dm2mMU3YvYrFVRvNtNZPNNJGlVtf93pNKxyyCDdFDfs4kh2tbrVfSin3Ku5s/qxtcjGeYGbEETbUUoBlQSemYiNrgbv+fn+snr+x7q1kV49vE+C5pxjtaaAnCp+oxWuzpXGwDvwthIT/3U6P5R6HE8l49FABGHOeX8PJcC2TJ8ZcI=
 sudo: false
 jobs:
   include:

diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/0ehba569dttgsuyv?svg=true)](https://ci.appveyor.com/project/kbarnhart/umami)
 [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/TerrainBento/umami/master)
 [![Coverage Status](https://coveralls.io/repos/github/TerrainBento/umami/badge.svg?branch=master)](https://coveralls.io/github/TerrainBento/umami?branch=master)
+[![Anaconda-Server Badge](https://anaconda.org/conda-forge/umami/badges/installer/conda.svg)](https://conda.anaconda.org/conda-forge)
 
 # Umami
 

diff --git a/setup.cfg b/setup.cfg
@@ -13,7 +13,7 @@ test=pytest
 minversion = 3.0
 filterwarnings =
     ignore::RuntimeWarning
-testpaths =  umami tests
+testpaths = umami tests
 norecursedirs = .* *.egg* build dist examples
 addopts =
   --ignore setup.py