Skip to content

Commit

Permalink
Merge pull request #5 from ccnmtl/pyup-update-django-1.9.13-to-1.11.3
Browse files Browse the repository at this point in the history
Update django to 1.11.3
  • Loading branch information
sdreher committed Jul 6, 2017
2 parents 39557e0 + 082b9b5 commit 2167e03
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ celerybeat-schedule
# virtualenv
venv/
ENV/
ve/

# Spyder project settings
.spyderproject
Expand Down
16 changes: 11 additions & 5 deletions runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ def main():
'infranil',
'django_jenkins',
),
TEST_RUNNER = 'django.test.runner.DiscoverRunner',
TEST_RUNNER='django.test.runner.DiscoverRunner',

COVERAGE_EXCLUDES_FOLDERS = ['migrations'],
ROOT_URLCONF = 'infranil.tests.urls',
COVERAGE_EXCLUDES_FOLDERS=['migrations'],
ROOT_URLCONF='infranil.tests.urls',

PROJECT_APPS = [
PROJECT_APPS=[
'infranil',
],
# Django replaces this, but it still wants it. *shrugs*
DATABASES = {
DATABASES={
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': ':memory:',
Expand All @@ -40,6 +40,12 @@ def main():
'PASSWORD': '',
}
},
TEMPLATES=[
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'APP_DIRS': True,
},
]
)

django.setup()
Expand Down
2 changes: 1 addition & 1 deletion test_reqs.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django==1.9.13
Django==1.11.3
Markdown==2.6.8
coverage==4.4.1
flake8==3.3.0
Expand Down

0 comments on commit 2167e03

Please sign in to comment.