From 5947d17e288e6737ff0e4af729008ce2d0ce7bd7 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 28 Mar 2017 23:52:44 +1100 Subject: [PATCH 1/7] travis update --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2c432d58d5..92d8254e39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,10 @@ python: before_install: - pip install pep8 + - pip install django + +before_script: + - "pep8 --exclude=migrations --ignore=E402,W293,E502 InvenTree" 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 From 8e77410074002260bcecebbeb121d4ed4caf2ed7 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 28 Mar 2017 23:55:31 +1100 Subject: [PATCH 2/7] no message --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92d8254e39..fe22185e17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ before_install: - pip install django before_script: - - "pep8 --exclude=migrations --ignore=E402,W293,E502 InvenTree" + - "pep8 --exclude=migrations --ignore=E402,W293,E501 InvenTree" script: - - find . -name \*.py -exec pep8 --ignore=E402,W293,E501 {} + \ No newline at end of file + \ No newline at end of file From f14ae18080e6123338fe0b67aeace80eb96f4dbd Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 28 Mar 2017 23:59:57 +1100 Subject: [PATCH 3/7] - moved database - added django db test --- .travis.yml | 2 +- InvenTree/InvenTree/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fe22185e17..448f12de7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,4 @@ before_script: - "pep8 --exclude=migrations --ignore=E402,W293,E501 InvenTree" script: - \ No newline at end of file + - python manage.py syncdb --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'), } } From beddb946837114cc93d076acc53d0a572a74669b Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 29 Mar 2017 00:01:58 +1100 Subject: [PATCH 4/7] fixed path to manage.db --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 448f12de7c..6b6afd5db2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,6 @@ before_install: - pip install pep8 - pip install django -before_script: - - "pep8 --exclude=migrations --ignore=E402,W293,E501 InvenTree" - script: - - python manage.py syncdb --noinput \ No newline at end of file + - "pep8 --exclude=migrations --ignore=E402,W293,E501 InvenTree" + - python InvenTree/manage.py syncdb --noinput \ No newline at end of file From b232649b63f84cb958c2ce8bf8246fec8a8ae7cd Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 29 Mar 2017 00:07:08 +1100 Subject: [PATCH 5/7] Added 'check' command --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6b6afd5db2..8443ce5ef1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,4 @@ before_install: script: - "pep8 --exclude=migrations --ignore=E402,W293,E501 InvenTree" - - python InvenTree/manage.py syncdb --noinput \ No newline at end of file + - python InvenTree/manage.py check \ No newline at end of file From ff2f2d2326a40649e0f1b97cfb95993989ad994d Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 29 Mar 2017 00:11:08 +1100 Subject: [PATCH 6/7] Requires python 3.4 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8443ce5ef1..18607a7baa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: python python: - - 3.3 + - 3.4 before_install: - pip install pep8 From 277b4360e3649e1116a05f95b280c0486f544874 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 29 Mar 2017 00:14:27 +1100 Subject: [PATCH 7/7] pip intall restframework --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 18607a7baa..2ee970d740 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,9 @@ python: before_install: - pip install pep8 - pip install django + - pip install djangorestframework script: - "pep8 --exclude=migrations --ignore=E402,W293,E501 InvenTree" - - python InvenTree/manage.py check \ No newline at end of file + - python InvenTree/manage.py check + - python InvenTree/manage.py test --noinput \ No newline at end of file