diff --git a/ccdb5_ui/config/settings.py b/ccdb5_ui/config/settings.py index 91692b2a1..f8ff55d3f 100644 --- a/ccdb5_ui/config/settings.py +++ b/ccdb5_ui/config/settings.py @@ -4,10 +4,10 @@ Generated by 'django-admin startproject' using Django 1.8.15. For more information on this file, see -https://docs.djangoproject.com/en/1.8/topics/settings/ +https://docs.djangoproject.com/en/1.11/topics/settings/ For the full list of settings and their values, see -https://docs.djangoproject.com/en/1.8/ref/settings/ +https://docs.djangoproject.com/en/1.11/ref/settings/ """ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) @@ -17,7 +17,7 @@ # Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/ +# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = os.environ.get('SECRET_KEY', os.urandom(32)) @@ -65,13 +65,13 @@ # Database -# https://docs.djangoproject.com/en/1.8/ref/settings/#databases +# https://docs.djangoproject.com/en/1.11/ref/settings/#databases DATABASES = {} # Internationalization -# https://docs.djangoproject.com/en/1.8/topics/i18n/ +# https://docs.djangoproject.com/en/1.11/topics/i18n/ LANGUAGE_CODE = 'en-us' @@ -85,7 +85,7 @@ # Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/1.8/howto/static-files/ +# https://docs.djangoproject.com/en/1.11/howto/static-files/ STATIC_URL = '/static/' diff --git a/setup.py b/setup.py index 723718460..5e7758e07 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ def read_file(filename): zip_safe=False, setup_requires=['cfgov_setup==1.2', 'setuptools-git-version==1.0.3'], install_requires=[ - 'Django>=1.8,<1.12', + 'Django>=1.11,<1.12', ], frontend_build_script='frontendbuild.sh' ) diff --git a/tox.ini b/tox.ini index 67d427e62..69e6fc731 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] skipsdist=True -envlist=dj{18,111} +envlist=dj{111} [testenv] install_command=pip install -e ".[testing]" -U {opts} {packages} @@ -9,6 +9,4 @@ commands=coverage run ./manage.py test deps= coverage==4.5.1 - - dj18: Django>=1.8,<1.9 dj111: Django>=1.11,<1.12