Depend on more recent scikit-learn

And add neurodebian to travis in order to support it
jdswinbank · Mar 23, 2014 · 5592647 · 5592647
1 parent 0bbe978
commit 5592647
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,8 @@ python:
 virtualenv:
   system_site_packages: true
 before_install:
+    - wget -O- http://neuro.debian.net/lists/precise.us-nh.libre | sudo tee /etc/apt/sources.list.d/neurodebian.sources.list
+    - sudo apt-key adv --recv-keys --keyserver pgp.mit.edu 2649A5A9
     - if [[ $TRAVIS_PYTHON_VERSION != '2.7' ]]; then wget http://repo.continuum.io/miniconda/Miniconda-2.2.2-Linux-x86_64.sh -O miniconda.sh ; fi
     - if [[ $TRAVIS_PYTHON_VERSION != '2.7' ]]; then chmod +x miniconda.sh ; fi
     - if [[ $TRAVIS_PYTHON_VERSION != '2.7' ]]; then ./miniconda.sh -b ; fi

diff --git a/hmmlearn/hmm.py b/hmmlearn/hmm.py
@@ -16,12 +16,11 @@
 from sklearn.utils import check_random_state
 from sklearn.utils.extmath import logsumexp
 from sklearn.base import BaseEstimator
-from sklearn.mixture import GMM, sample_gaussian,  _validate_covars
+from sklearn.mixture import (
+    GMM, sample_gaussian,
+    distribute_covar_matrix_to_match_covariance_type, _validate_covars)
 from sklearn import cluster
 
-from .utils.fixes import log_multivariate_normal_density, \
-    distribute_covar_matrix_to_match_covariance_type
-
 from . import _hmmc
 
 __all__ = ['GMMHMM',