diff --git a/.travis.yml b/.travis.yml index 2c432d58d5..2ee970d740 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,13 @@ language: python python: - - 3.3 + - 3.4 before_install: - pip install pep8 + - pip install django + - pip install djangorestframework script: - # TODO - Only perform PEP8 checks on files that have been changed in this push / PR - - find . -name \*.py -exec pep8 --ignore=E402,W293,E501 {} + \ No newline at end of file + - "pep8 --exclude=migrations --ignore=E402,W293,E501 InvenTree" + - python InvenTree/manage.py check + - python InvenTree/manage.py test --noinput \ No newline at end of file diff --git a/InvenTree/InvenTree/settings.py b/InvenTree/InvenTree/settings.py index e0cc196543..8585f5b911 100644 --- a/InvenTree/InvenTree/settings.py +++ b/InvenTree/InvenTree/settings.py @@ -86,7 +86,7 @@ WSGI_APPLICATION = 'InvenTree.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + 'NAME': os.path.join(BASE_DIR, 'inventree_db.sqlite3'), } }