Skip to content

Commit

Permalink
Merge pull request #138 from cfpb/post-dj111-cleanup
Browse files Browse the repository at this point in the history
Remove Django 1.8 compatibility
  • Loading branch information
schbetsy authored Sep 28, 2018
2 parents 3a7d999 + 850c975 commit b847282
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
12 changes: 6 additions & 6 deletions ccdb5_ui/config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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, ...)
Expand All @@ -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))
Expand Down Expand Up @@ -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'

Expand All @@ -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/'

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
)
4 changes: 1 addition & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
[tox]
skipsdist=True

envlist=dj{18,111}
envlist=dj{111}

[testenv]
install_command=pip install -e ".[testing]" -U {opts} {packages}
commands=coverage run ./manage.py test

deps=
coverage==4.5.1

dj18: Django>=1.8,<1.9
dj111: Django>=1.11,<1.12

0 comments on commit b847282

Please sign in to comment.