Merge pull request #6 from SchrodingersGat/master

travis update

.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 {} +
+    - "pep8 --exclude=migrations --ignore=E402,W293,E501 InvenTree"
+    - python InvenTree/manage.py check
+    - python InvenTree/manage.py test --noinput

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'),
     }
 }