diff --git a/pv/urls.py b/pv/urls.py index 9ed9a2c3259c59fbd6220334d14c3155b9aed034..e0159f0812048341d20038b54c6993c4e1f31a96 100644 --- a/pv/urls.py +++ b/pv/urls.py @@ -30,27 +30,27 @@ router.register(r'languages', APILanguageViewSet) show_router = routers.NestedSimpleRouter(router, r'shows', lookup='show') # /shows/1/schedules -show_router.register(r'schedules', APIScheduleViewSet, base_name='show-schedules') +show_router.register(r'schedules', APIScheduleViewSet, basename='show-schedules') # /shows/1/notes -show_router.register(r'notes', APINoteViewSet, base_name='show-notes') +show_router.register(r'notes', APINoteViewSet, basename='show-notes') # /shows/1/timeslots -show_router.register(r'timeslots', APITimeSlotViewSet, base_name='show-timeslots') +show_router.register(r'timeslots', APITimeSlotViewSet, basename='show-timeslots') show_timeslot_router = routers.NestedSimpleRouter(show_router, r'timeslots', lookup='timeslot') # /shows/1/timeslots/1/note/ -show_timeslot_router.register(r'note', APINoteViewSet, base_name='show-timeslots-note') +show_timeslot_router.register(r'note', APINoteViewSet, basename='show-timeslots-note') # /shows/1/schedules schedule_router = routers.NestedSimpleRouter(show_router, r'schedules', lookup='schedule') # /shows/1/schedules/1/timeslots -schedule_router.register(r'timeslots', APITimeSlotViewSet, base_name='schedule-timeslots') +schedule_router.register(r'timeslots', APITimeSlotViewSet, basename='schedule-timeslots') timeslot_router = routers.NestedSimpleRouter(schedule_router, r'timeslots', lookup='timeslot') # /shows/1/schedules/1/timeslots/1/note -timeslot_router.register(r'note', APINoteViewSet, base_name='timeslots-note') +timeslot_router.register(r'note', APINoteViewSet, basename='timeslots-note') urlpatterns = [ @@ -72,4 +72,4 @@ urlpatterns = [ ] if settings.DEBUG: - urlpatterns.append(url(r'^site_media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT})) \ No newline at end of file + urlpatterns.append(url(r'^site_media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT})) diff --git a/requirements.txt b/requirements.txt index 0a36335c2ff26b9a363becb06762b0866917d8a6..5a59c7ca499d7a1dca81882afcb50bff986f76f5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,10 @@ -Django==1.11.3 -mysqlclient -#postgresql -#postgresql-contrib -#psycopg2 -Pillow==4.2.1 -PyYAML==3.12 -django-tinymce==2.6.0 -python-dateutil==2.6.0 -django-versatileimagefield==1.8.1 -djangorestframework==3.7.3 -drf-nested-routers==0.90.0 -django-oidc-provider==0.5.2 -django-cors-headers +Django==1.11.29 +django-cors-headers==3.2.1 +django-oidc-provider==0.7.0 +django-tinymce==2.8.0 +django-versatileimagefield==1.11 +djangorestframework==3.11.0 +drf-nested-routers==0.91 +Pillow==4.3.0 +python-dateutil==2.8.1 +PyYAML==3.13