From 2c1533b329f550163c8c7e09ff99c084ea866b13 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Fri, 27 Jun 2014 15:14:58 +0200 Subject: [PATCH] Split requirements file into two This makes it easier to keep track of packages needed for development and production, and it's better for testing --- .travis.yml | 7 +++++-- requirements.txt | 5 ++++- requirements_devel.txt | 11 +++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 requirements_devel.txt diff --git a/.travis.yml b/.travis.yml index d0a93a09a..c6829790d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ install: # - sh -c "if [ '$DB' = 'mysql' ]; then pip install mysql-python; fi" - sh -c "if [ '$DB' = 'postgresql' ]; then pip install psycopg2; fi" - - pip install -r requirements.txt + - pip install -r requirements_devel.txt - pip install -q Django==$DJANGO_VERSION - python extras/scripts/create_local_settings.py @@ -31,10 +31,13 @@ before_script: script: # Regular application - - ./manage.py test + - coverage run --source='.' ./manage.py test # Mobile version - TEST_MOBILE=True ./manage.py test # Formatting - pep8 --max-line-length=100 --exclude="urls.py,*migrations*" wger + + # Code coverage + - coverage report \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index f5c79f6a6..05c4f0a55 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,12 @@ +# +# Requirements for wger for production +# + Django>=1.6,<1.7 django-browserid==0.9 django-recaptcha reportlab django_mobile -pep8 bleach south < 2.0 django-tastypie==0.9.16 diff --git a/requirements_devel.txt b/requirements_devel.txt new file mode 100644 index 000000000..633c0bf42 --- /dev/null +++ b/requirements_devel.txt @@ -0,0 +1,11 @@ +# +# Requirements for wger during development +# + +# Production packages +-r requirements.txt + +# Development packages +pep8 +django-debug-toolbar +coverage \ No newline at end of file