diff --git a/testproj/manage.py b/testproj/manage.py index 431d446..2fa96ac 100755 --- a/testproj/manage.py +++ b/testproj/manage.py @@ -7,9 +7,6 @@ if __name__ == "__main__": try: from django.core.management import execute_from_command_line except ImportError: - # The above import may fail for some other reason. Ensure that the - # issue is really that Django is missing to avoid masking other - # exceptions on Python 2. try: import django # noqa: F401 except ImportError: diff --git a/testproj/testproj/settings/base.py b/testproj/testproj/settings/base.py index b387a17..ba9f398 100644 --- a/testproj/testproj/settings/base.py +++ b/testproj/testproj/settings/base.py @@ -70,8 +70,6 @@ WSGI_APPLICATION = 'testproj.wsgi.application' LOGIN_URL = reverse_lazy('admin:login') # Password validation -# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators - AUTH_PASSWORD_VALIDATORS = [ { 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', @@ -88,7 +86,6 @@ AUTH_PASSWORD_VALIDATORS = [ ] # Django Rest Framework - REST_FRAMEWORK = { 'DEFAULT_PERMISSION_CLASSES': ( 'rest_framework.permissions.IsAuthenticated', @@ -151,8 +148,6 @@ REDOC_SETTINGS = { } # Internationalization -# https://docs.djangoproject.com/en/1.11/topics/i18n/ - LANGUAGE_CODE = 'en-us' TIME_ZONE = 'UTC' USE_I18N = True @@ -160,8 +155,6 @@ USE_L10N = True USE_TZ = True # Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/1.11/howto/static-files/ - STATIC_URL = '/static/' STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles') STATICFILES_DIRS = [ @@ -169,11 +162,9 @@ STATICFILES_DIRS = [ ] # Testing - TEST_RUNNER = 'testproj.runner.PytestTestRunner' # Logging configuration - LOGGING = { 'version': 1, 'disable_existing_loggers': True, diff --git a/testproj/testproj/settings/heroku.py b/testproj/testproj/settings/heroku.py index 61ea1f1..98c6b47 100644 --- a/testproj/testproj/settings/heroku.py +++ b/testproj/testproj/settings/heroku.py @@ -23,8 +23,6 @@ STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage' MIDDLEWARE.insert(0, 'whitenoise.middleware.WhiteNoiseMiddleware') # Database -# https://docs.djangoproject.com/en/1.11/ref/settings/#databases - DATABASES = { 'default': dj_database_url.config(conn_max_age=600) } diff --git a/testproj/testproj/settings/local.py b/testproj/testproj/settings/local.py index 70077e0..393566d 100644 --- a/testproj/testproj/settings/local.py +++ b/testproj/testproj/settings/local.py @@ -15,7 +15,6 @@ DATABASES = { } # Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = '!z1yj(9uz)zk0gg@5--j)bc4h^i!8))r^dezco8glf190e0&#p'