Unified test script for Travis and Docker

scidash · Nov 4, 2017 · bad95bd · bad95bd
1 parent 482ade0
commit bad95bd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,12 +22,10 @@ install:
   - conda update -q conda
   # Useful for debugging any issues with conda
   - conda info -a
-  - pip install --process-dependency-links . 
+  - pip install . --process-dependency-links
   - pip install coveralls
 ######################################################
-before_script:
-  - git clone -b cosmosuite http://github.com/scidash/scidash ../scidash
 script: 
-  - coverage run --source=. --omit=*unit_test*,setup.py,.eggs setup.py test  
+  - sh test.sh
 after_success:
   - coveralls
diff --git a/Dockerfile b/Dockerfile
@@ -8,4 +8,5 @@ USER root
 RUN chown -R $NB_USER . 
 USER $NB_USER
 
-RUN python setup.py install
+RUN pip install -e . --process-dependency-links
+RUN sh test.sh
diff --git a/test.sh b/test.sh
@@ -0,0 +1,3 @@
+pip install coveralls
+git clone -b cosmosuite http://github.com/scidash/scidash ../scidash
+coverage run --source=. --omit=*unit_test*,setup.py,.eggs setup.py test