Merge branch 'dev' of github.com:KrishnaswamyLab/MAGIC into dev

KrishnaswamyLab · Jul 12, 2018 · c7f4689 · c7f4689
2 parents 95872a5 + d4f2ff5
commit c7f4689
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,20 +18,20 @@ env:
 
 before_install:
   - chmod +x travis_setup.sh; ./travis_setup.sh
-  - $HOME/miniconda2/bin/pip install --user phate
-  - $HOME/miniconda3/bin/pip install --user phate
+  - $HOME/miniconda2/bin/pip install phate
+  - $HOME/miniconda3/bin/pip install phate
   - R -e "install.packages(c('reticulate', 'devtools', 'readr', 'phateR', 'Matrix', 'ggplot2', 'viridis'))"
 
 install:
-  - cd python; python2 setup.py install --user
-  - python3 setup.py install --user
+  - cd python; python2 setup.py install
+  - python3 setup.py install
   - cd ../Rmagic; R CMD INSTALL .; cd ..
 
 script:
   - cd Rmagic; R CMD build .
   - travis_wait 30 R CMD check *tar.gz
-  - cd ../python; $HOME/miniconda2/bin/pip install -U .[test,doc]
-  - $HOME/miniconda3/bin/pip install -U .[test,doc]
+  - cd ../python; $HOME/miniconda2/bin/pip install -e .[test,doc]
+  - $HOME/miniconda3/bin/pip install -e .[test,doc]
   - python2 setup.py test
   - python3 setup.py test
   - cd doc; make html

diff --git a/python/magic/test.py b/python/magic/test.py
@@ -35,7 +35,7 @@ def test_scdata():
 def test_anndata():
     try:
         anndata
-    except (ImportError, SyntaxError):
+    except NameError:
         # anndata not installed
         return
     scdata = anndata.read_csv("../data/test_data.csv")