Skip to content

Commit

Permalink
clean up Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
saxix committed Jan 3, 2014
1 parent cf16a48 commit fe3365e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
9 changes: 4 additions & 5 deletions Makefile
Expand Up @@ -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:
Expand All @@ -38,19 +37,19 @@ 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"
@sh -c "if [ '${DJANGO}' = 'dev' ]; then pip install ${DJANGO_DEV}; fi"
@pip install coverage
@python -c "from __future__ import print_function;import django;print('Django version:', django.get_version())"
@echo "Database:" ${DBENGINE}

$(MAKE) coverage


Expand Down
1 change: 1 addition & 0 deletions requirements.pip
Expand Up @@ -11,3 +11,4 @@ sphinx_rtd_theme==0.1.5
Sphinx==1.1.3
setuptools==2.0.2
py==1.4.19
coverage

0 comments on commit fe3365e

Please sign in to comment.