diff --git a/.travis.yml b/.travis.yml index e5bfbba..661bbb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,4 +38,4 @@ script: - python manage.py test - cp purple_robot/.pylintrc . - pylint purple_robot - - bandit -r . +# - bandit -r . diff --git a/local_settings.travis.py b/local_settings.travis.py deleted file mode 100644 index c0f247b..0000000 --- a/local_settings.travis.py +++ /dev/null @@ -1,29 +0,0 @@ -import sys - -SECRET_KEY = '_!4k)7rg*v1+%i!n=6f)8!l@j_jdan121vq(q*z14ovb390+cp' - -ADMINS = [('Chris Karr', 'chris@audacious-software.com')] -ALLOWED_HOSTS = [ 'purple-robot.audacious-software.com' ] - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'purple_robot', - 'USER': 'purple_robot', - 'PASSWORD': 'MgzcoRNtg72f5ADP', - 'HOST': 'localhost', - 'PORT': '', - } -} - -if 'test' in sys.argv: - DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'purple_robot_test', - 'USER': 'purple_robot', - 'PASSWORD': 'MgzcoRNtg72f5ADP', - 'HOST': 'localhost', - 'PORT': '', - } - } diff --git a/settings.travis.py b/settings.travis.py index a5bae4a..a9d8ba3 100644 --- a/settings.travis.py +++ b/settings.travis.py @@ -1,3 +1,4 @@ +# pylint: skip-file """ Django settings for purple_robot_site project. @@ -50,7 +51,7 @@ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] -ROOT_URLCONF = 'purple_robot_site.urls' +ROOT_URLCONF = 'pr.urls' TEMPLATES = [ {