Skip to content

Commit

Permalink
Merge 43b2368 into 890f629
Browse files Browse the repository at this point in the history
  • Loading branch information
ElMonstro committed Mar 1, 2019
2 parents 890f629 + 43b2368 commit b024d70
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 10 deletions.
4 changes: 4 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[flake8]
ignore = W3921
max-line-length = 80
exclude = */tests/* */settings/*
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ script:
after_script:
- coverage xml
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
- find ./authors/ -name \*.py -exec flake8 -v {} +

after_success:
- coverallslanguage: python
Expand Down
4 changes: 2 additions & 2 deletions authors/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"""

import os
from decouple import config, Csv
from decouple import config

# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
Expand All @@ -20,7 +20,7 @@
# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/

# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = config('SECRET_KEY', default = '#dfhewy73twy3e88Y@Y828Y@91')
SECRET_KEY = config('SECRET_KEY', default='#dfhewy73twy3e88Y@Y828Y@91')

# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
Expand Down
7 changes: 3 additions & 4 deletions authors/settings/dev.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import os
from authors.settings.base import *

# SECURITY WARNING: don't run with debug turned on in production!
Expand All @@ -10,9 +9,9 @@
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': config('DB_NAME', default = 'legion_backend'),
'USER': config('DB_USER', default = 'legion'),
'PASSWORD': config('DB_PASSWORD', default = '&L3g10n'),
'NAME': config('DB_NAME', default='legion_backend'),
'USER': config('DB_USER', default='legion'),
'PASSWORD': config('DB_PASSWORD', default='&L3g10n'),
'HOST': config('DB_HOST'),
'PORT': '',
}
Expand Down
7 changes: 3 additions & 4 deletions authors/settings/staging.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import os
from authors.settings.base import *

# SECURITY WARNING: don't run with debug turned on in production!
Expand All @@ -8,9 +7,9 @@
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': config('DB_NAME', default = 'legion_backend'),
'USER': config('DB_USER', default = 'legion'),
'PASSWORD': config('DB_PASSWORD', default = '&L3g10n'),
'NAME': config('DB_NAME', default='legion_backend'),
'USER': config('DB_USER', default='legion'),
'PASSWORD': config('DB_PASSWORD', default='&L3g10n'),
'HOST': config('DB_HOST'),
'PORT': '',
}
Expand Down
20 changes: 20 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,32 @@
astroid==2.2.0
autopep8==1.4.3
certifi==2018.11.29
chardet==3.0.4
coverage==4.5.2
coveralls==1.6.0
dj-database-url==0.5.0
Django==2.1.7
django-cors-middleware==1.3.1
django-extensions==2.1.6
djangorestframework==3.9.1
docopt==0.6.2
entrypoints==0.3
flake8==3.7.7
gunicorn==19.9.0
idna==2.8
isort==4.3.9
lazy-object-proxy==1.3.1
mccabe==0.6.1
psycopg2-binary==2.7.7
pycodestyle==2.5.0
pyflakes==2.1.0
PyJWT==1.4.2
pylint==2.3.0
python-decouple==3.1
pytz==2018.9
requests==2.21.0
six==1.10.0
typed-ast==1.3.1
urllib3==1.24.1
whitenoise==4.1.2
wrapt==1.11.1

0 comments on commit b024d70

Please sign in to comment.