thermokarst/ccdb-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MAINT: Upgrade to Django 1.11 (#45)

Browse source
This commit is contained in:
Matthew Ryan Dillon 2018-01-25 06:51:32 -07:00 • committed by GitHub
parent 17899ad7c7
commit a482019a81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 101 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

11
config/settings/local.py
View file

@ -27,14 +27,6 @@ INTERNAL_IPS = ('127.0.0.1', )
TEST_RUNNER = 'django.test.runner.DiscoverRunner'
# http://stackoverflow.com/a/28560805/313548
class DisableMigrations(object):
def __contains__(self, item):
return True
def __getitem__(self, item):
return "notmigrations"
TESTS_IN_PROGRESS = False
if 'test' in sys.argv[1:] or 'jenkins' in sys.argv[1:]:
logging.disable(logging.CRITICAL)
@ -44,7 +36,8 @@ if 'test' in sys.argv[1:] or 'jenkins' in sys.argv[1:]:
DEBUG = False
TEMPLATE_DEBUG = False
TESTS_IN_PROGRESS = True
MIGRATION_MODULES = DisableMigrations()
MIGRATION_MODULES = {app[app.rfind('.') + 1:]: None
for app in INSTALLED_APPS}
MANIFEST_URL = env('MANIFEST_URL', default=None)
CORS_ORIGIN_ALLOW_ALL = False

6
config/urls.py
View file

@ -4,13 +4,13 @@ from django.conf.urls.static import static
from django.contrib import admin
from django.views.generic import RedirectView
from django.views import defaults as default_views
from django.core.urlresolvers import reverse_lazy
from django.urls import reverse_lazy
urlpatterns = [
url(settings.ADMIN_URL, include(admin.site.urls)),
url(settings.ADMIN_URL, admin.site.urls),
url(r'^api-auth/', include('rest_framework.urls',
namespace='rest_framework')),
url(r'^api/', include('ccdb.api.urls', namespace='api')),
url(r'^api/', include('ccdb.api.urls')),
url(r'^$', RedirectView.as_view(url=reverse_lazy('admin:index'),
permanent=True)),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)