Merge pull request #113 from KrishnaswamyLab/python_magic2

Python magic2
KrishnaswamyLab · Jun 30, 2018 · e1829d4 · e1829d4
2 parents 8490cb2 + 31a469f
commit e1829d4
Show file tree

Hide file tree

Showing 99 changed files with 12,210 additions and 4,536 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@ python/*.so
 python/*.dll
 python/*.egg-info
 python/magic/__pycache__
+python/magic/*.pyc
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,46 @@
+# R for travis: see documentation at https://docs.travis-ci.com/user/languages/r
+
+language: r
+sudo: required
+cache: packages
+
+os:
+  - linux
+
+r:
+  - oldrel
+  - release
+  - devel
+
+cache: packages
+
+env:
+  global:
+    - PATH="$HOME/miniconda2/bin:$HOME/miniconda3/bin:$PATH"
+    - RETICULATE_PYTHON="$HOME/miniconda2/bin/python"
+
+before_install:
+  - chmod +x travis_setup.sh
+  - ./travis_setup.sh
+  - $HOME/miniconda2/bin/pip install --user phate nose2
+  - $HOME/miniconda3/bin/pip install --user phate nose2
+  - 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 ../Rmagic
+  - R CMD INSTALL .
+  - cd ..
+
+script:
+  - cd Rmagic
+  - R CMD build .
+  - travis_wait 30 R CMD check *tar.gz
+  - cd ../python
+  - python2 setup.py test
+  - python3 setup.py test
+  - cd ..
+
+warnings_are_errors: true
diff --git a/R/DESCRIPTION b/R/DESCRIPTION
diff --git a/R/EMT_data_R_after_magic.png b/R/EMT_data_R_after_magic.png
diff --git a/R/EMT_data_R_before_magic.png b/R/EMT_data_R_before_magic.png
diff --git a/R/MAGIC Tutorial R-EMT.pptx b/R/MAGIC Tutorial R-EMT.pptx
diff --git a/R/NAMESPACE b/R/NAMESPACE
diff --git a/R/R/run_magic.R b/R/R/run_magic.R
diff --git a/R/man/run_magic.Rd b/R/man/run_magic.Rd
diff --git a/R/optimal_t.pdf b/R/optimal_t.pdf
diff --git a/R/tests/test_magic.R b/R/tests/test_magic.R