Update for coveralls (#370)

Update coveralls path

.codeclimate.yml

@@ -30,6 +30,6 @@ ratings:
   - "**.py"
   - "**.rb"
 exclude_paths:
-  - django/static/**/*
-  - django/ckeditor/static/**/*
-  - django/**/migrations/**/*
+  - app/static/**/*
+  - app/ckeditor/static/**/*
+  - app/**/migrations/**/*

.coveragerc

@@ -0,0 +1,4 @@
+[paths]
+source =
+    ./app/
+    /app/

.gitignore

@@ -67,8 +67,8 @@ local.properties
 .buildpath
 
 # ignore any specific conf files, execept the default one
-django/comic/settings/*.conf
-!django/comic/settings/00_default.conf
+app/comic/settings/*.conf
+!app/comic/settings/00_default.conf
 
 # Ignore intellij stuff
 *.iml

.travis.yml

@@ -18,18 +18,22 @@ before_install:
   - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
   - chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
+  - pip install coveralls
 
 install:
   - docker-compose up --build -d
 
 script: >-
   docker-compose run web dockerize -wait tcp://db:3306 -timeout 120s
   bash -c "
-  pip install coveralls
-  && coverage run manage.py test
-  && export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
-  && coveralls
+  pip install coverage
+  && coverage run --source='.' manage.py test
   "
 
+after_success:
+  - mv app/.coverage .coverage.docker
+  - coverage combine
+  - coveralls
+
 after_script:
   - docker-compose down

README.rst

@@ -30,7 +30,7 @@ Testing
 
 You can run the tests by invoking::
 
-    python django/manage.py test
+    python app/manage.py test
 
 Getting the framework up and running
 ------------------------------------

docker-compose.yml

@@ -20,11 +20,8 @@ services:
       - db
       - memcached
       - dropbox
-    environment:
-      COVERALLS_REPO_TOKEN: "${COVERALLS_REPO_TOKEN}"
     volumes:
       - static:/static/
-      - .git:/.git:ro
       - ./app:/app/
     volumes_from:
       - dropbox