diff --git a/Makefile b/Makefile index aa22be3..45630e2 100644 --- a/Makefile +++ b/Makefile @@ -14,9 +14,8 @@ mkbuilddir: install-deps: - pip install \ - -r demo/demoproject/requirements.pip \ - -r requirements.pip python-coveralls coverage + pip install -q \ + -r requirements.pip python-coveralls locale: @@ -38,11 +37,12 @@ init-db: test: demo/manage.py test concurrency --settings=${DJANGO_SETTINGS_MODULE} -v2 + coverage: mkbuilddir py.test --cov=concurrency --cov-report=html --cov-report=term --cov-config=.coveragerc -vvv -ci: +ci: init-db install-deps @sh -c "if [ '${DJANGO}' = '1.4.x' ]; then pip install ${DJANGO_14}; fi" @sh -c "if [ '${DJANGO}' = '1.5.x' ]; then pip install ${DJANGO_15}; fi" @sh -c "if [ '${DJANGO}' = '1.6.x' ]; then pip install ${DJANGO_16}; fi" @@ -50,7 +50,6 @@ ci: @pip install coverage @python -c "from __future__ import print_function;import django;print('Django version:', django.get_version())" @echo "Database:" ${DBENGINE} - $(MAKE) coverage diff --git a/requirements.pip b/requirements.pip index 2fdace2..004b92a 100644 --- a/requirements.pip +++ b/requirements.pip @@ -11,3 +11,4 @@ sphinx_rtd_theme==0.1.5 Sphinx==1.1.3 setuptools==2.0.2 py==1.4.19 +coverage