Upgrade Django to 2.1.7

This is a squashed version of #809 with the conflicts resolved
LibraryOfCongress · Feb 12, 2019 · 147d65f · 147d65f
1 parent 03ccf91
commit 147d65f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/Pipfile b/Pipfile
@@ -13,7 +13,7 @@ django-haystack = "*"
 "boto3" = ">=1.9.16"
 botocore = '>=1.12.16'
 requests = "*"
-Django = ">=2.0.9"
+Django = ">=2.1.7"
 Pillow = "*"
 confusable_homoglyphs = ">=3.1.1"
 Whoosh = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import find_packages, setup
 
 VERSION = __import__("concordia").get_version()
-INSTALL_REQUIREMENTS = ["boto3", "Django>=2.1.5"]
+INSTALL_REQUIREMENTS = ["boto3", "Django>=2.1.7"]
 SCRIPTS = ["manage.py"]
 DESCRIPTION = "Transcription crowdsourcing"
 CLASSIFIERS = """\