Merge branch 'dev' into feature/r_scripts

KrishnaswamyLab · Feb 5, 2019 · ae3beea · ae3beea
2 parents 1c7ba3a + b2343aa
commit ae3beea
Show file tree

Hide file tree

Showing 52 changed files with 91 additions and 2,434 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,15 +19,15 @@
     - apt
 
   install:
-    - cd python; python setup.py install; cd ..
+    - python setup.py install
 
   script:
-    - cd python; pip install -U .[test,doc]
+    - pip install -U .[test,doc]
     - python setup.py test
-    - cd doc; make html; cd ../..
+    - cd doc; make html; cd ..
 
   after_success:
-    - cd python; coveralls
+    - coveralls
 
   deploy:
     provider: pypi

diff --git a/README.md b/README.md
diff --git a/python/README.rst → README.rst b/python/README.rst → README.rst
diff --git a/python/doc/Makefile → doc/Makefile b/python/doc/Makefile → doc/Makefile
diff --git a/python/doc/source/conf.py → doc/source/conf.py b/python/doc/source/conf.py → doc/source/conf.py
diff --git a/python/doc/source/index.rst → doc/source/index.rst b/python/doc/source/index.rst → doc/source/index.rst
diff --git a/python/doc/source/installation.rst → doc/source/installation.rst b/python/doc/source/installation.rst → doc/source/installation.rst
diff --git a/python/doc/source/reference.rst → doc/source/reference.rst b/python/doc/source/reference.rst → doc/source/reference.rst
diff --git a/python/doc/source/requirements.txt → doc/source/requirements.txt b/python/doc/source/requirements.txt → doc/source/requirements.txt
diff --git a/matlab/scrnaseq/matlab/downsample_molecules.m b/matlab/scrnaseq/matlab/downsample_molecules.m
diff --git a/matlab/scrnaseq/matlab/load_10xData.m b/matlab/scrnaseq/matlab/load_10xData.m
diff --git a/matlab/scrnaseq/matlab/mmread.m b/matlab/scrnaseq/matlab/mmread.m