Merge pull request django-ordered-model#52 from bfirsh/use-docker-for…

…-tests Use Docker to run tests
rubengrill · Apr 6, 2015 · e5de590 · e5de590
2 parents 5b6d715 + f739ac4
commit e5de590
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,5 +18,5 @@ matrix:
 install: pip install $DJANGO --use-mirrors
 
 # command to run tests
-script: ./run_tests.sh
+script: script/test-command
 
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,5 @@
+FROM python:2.7
+WORKDIR /code
+ADD requirements.txt /code/requirements.txt
+RUN pip install -r requirements.txt
+ADD . /code
diff --git a/README.md b/README.md
@@ -121,5 +121,7 @@ To add arrows in the admin change list page to do reordering, you can use the
 Test suite
 ----------
 
-    $ ./run_tests.sh
+Requires Docker.
+
+    $ script/test
 
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1 @@
+Django<1.8
diff --git a/script/test b/script/test
@@ -0,0 +1,3 @@
+#!/bin/sh
+docker build -t django-ordered-model .
+docker run django-ordered-model script/test-command
diff --git a/run_tests.sh → script/test-command b/run_tests.sh → script/test-command