remove api versioning completely

src/c3nav/api/urls.py

@@ -1,4 +1,3 @@
-from django.conf.urls import include, url
 from rest_framework.routers import DefaultRouter
 
 from c3nav.editor.api import HosterViewSet, SubmitTaskViewSet
@@ -13,7 +12,4 @@ router.register(r'features', FeatureViewSet)
 router.register(r'hosters', HosterViewSet, base_name='hoster')
 router.register(r'submittasks', SubmitTaskViewSet, base_name='submittask')
 
-
+urlpatterns = router.urls
-urlpatterns = [
-    url(r'^v1/', include(router.urls, namespace='v1')),
-]

src/c3nav/editor/api.py

@@ -18,14 +18,14 @@ class HosterViewSet(ViewSet):
     """
     Get Package Hosters
     """
-    def retrieve(self, request, pk=None, version=None):
+    def retrieve(self, request, pk=None):
         if pk not in hosters:
             raise Http404
         serializer = HosterSerializer(hosters[pk])
         return Response(serializer.data)
 
     @detail_route(methods=['get'])
-    def state(self, request, pk=None, version=None):
+    def state(self, request, pk=None):
         if pk not in hosters:
             raise Http404
 
@@ -39,7 +39,7 @@ class HosterViewSet(ViewSet):
         )))
 
     @detail_route(methods=['post'])
-    def auth_uri(self, request, pk=None, version=None):
+    def auth_uri(self, request, pk=None):
         if pk not in hosters:
             raise Http404
         return Response({
@@ -47,7 +47,7 @@ class HosterViewSet(ViewSet):
         })
 
     @detail_route(methods=['post'])
-    def submit(self, request, pk=None, version=None):
+    def submit(self, request, pk=None):
         if pk not in hosters:
             raise Http404
         hoster = hosters[pk]
@@ -92,7 +92,7 @@ class SubmitTaskViewSet(ViewSet):
     """
     Get Submit Tasks
     """
-    def retrieve(self, request, pk=None, version=None):
+    def retrieve(self, request, pk=None):
         task = submit_edit_task.AsyncResult(task_id=pk)
         try:
             task.ready()

src/c3nav/editor/static/editor/js/editor.js

@@ -30,7 +30,7 @@ editor = {
     },
 
     get_feature_types: function () {
-        $.getJSON('/api/v1/featuretypes/', function (feature_types) {
+        $.getJSON('/api/featuretypes/', function (feature_types) {
             var feature_type;
             var editcontrols = $('#mapeditlist');
             for (var i = 0; i < feature_types.length; i++) {
@@ -51,7 +51,7 @@ editor = {
 
     packages: {},
     get_packages: function () {
-        $.getJSON('/api/v1/packages/', function (packages) {
+        $.getJSON('/api/packages/', function (packages) {
             var bounds = [[0, 0], [0, 0]];
             var pkg;
             for (var i = 0; i < packages.length; i++) {
@@ -68,13 +68,13 @@ editor = {
 
     sources: {},
     get_sources: function () {
-        $.getJSON('/api/v1/sources/', function (sources) {
+        $.getJSON('/api/sources/', function (sources) {
             var layers = {};
             var source;
             for (var i = 0; i < sources.length; i++) {
                 source = sources[i];
                 editor.sources[source.name] = source;
-                source.layer = L.imageOverlay('/api/v1/sources/' + source.name + '/image/', source.bounds);
+                source.layer = L.imageOverlay('/api/sources/' + source.name + '/image/', source.bounds);
                 layers[source.name] = source.layer;
             }
             L.control.layers([], layers).addTo(editor.map);
@@ -85,7 +85,7 @@ editor = {
     _level: null,
     level_feature_layers: {},
     get_levels: function () {
-        $.getJSON('/api/v1/levels/?ordering=-altitude', function (levels) {
+        $.getJSON('/api/levels/?ordering=-altitude', function (levels) {
             L.LevelControl = L.Control.extend({
                 options: {
                     position: 'bottomright'
@@ -184,7 +184,7 @@ editor = {
 
     features: {},
     get_features: function () {
-        $.getJSON('/api/v1/features/', function(features) {
+        $.getJSON('/api/features/', function(features) {
             var feature_type;
             for (var level in editor.levels) {
                 for (var j = 0; j < editor.feature_types_order.length; j++) {

src/c3nav/editor/static/editor/js/finalize.js

@@ -14,7 +14,7 @@ finalize = {
         return $('#data').val();
     },
     _check_hoster: function() {
-        $.getJSON('/api/v1/hosters/'+finalize.hoster+'/state/', function(data) {
+        $.getJSON('/api/hosters/'+finalize.hoster+'/state/', function(data) {
             if (data.state == 'checking') {
                 window.setTimeout(finalize._check_hoster, 700);
             } else {
@@ -32,7 +32,7 @@ finalize = {
         finalize._set_state('oauth');
         $.ajax({
             type: "POST",
-            url: '/api/v1/hosters/'+finalize.hoster+'/auth_uri/',
+            url: '/api/hosters/'+finalize.hoster+'/auth_uri/',
             dataType: 'json',
             headers: {'X-CSRFToken': $('[name=csrfmiddlewaretoken]').val()},
             success: function(data) {
@@ -47,7 +47,7 @@ finalize = {
         finalize._set_state('progress');
         $.ajax({
             type: "POST",
-            url: '/api/v1/hosters/'+finalize.hoster+'/submit/',
+            url: '/api/hosters/'+finalize.hoster+'/submit/',
             data: {
                 'data': finalize.get_data(),
                 'commit_msg': commit_msg
@@ -72,7 +72,7 @@ finalize = {
         }
     },
     _check_submittask: function() {
-        $.getJSON('/api/v1/submittasks/'+finalize.submittask+'/', finalize.handle_task_data);
+        $.getJSON('/api/submittasks/'+finalize.submittask+'/', finalize.handle_task_data);
     }
 };
 

src/c3nav/mapdata/api.py

@@ -58,7 +58,7 @@ class SourceViewSet(AccessCachedViewSetMixin, ReadOnlyModelViewSet):
         return filter_source_queryset(self.request, super().get_queryset())
 
     @detail_route(methods=['get'])
-    def image(self, request, pk=None, version=None):
+    def image(self, request, pk=None):
         source = self.get_object()
         response = HttpResponse(content_type=mimetypes.guess_type(source.name)[0])
         image_path = os.path.join(settings.MAP_ROOT, source.package.directory, 'sources', source.name)
@@ -72,11 +72,11 @@ class FeatureTypeViewSet(ViewSet):
     Get Feature types
     """
 
-    def list(self, request, version=None):
+    def list(self, request):
         serializer = FeatureTypeSerializer(FEATURE_TYPES.values(), many=True, context={'request': request})
         return Response(serializer.data)
 
-    def retrieve(self, request, pk=None, version=None):
+    def retrieve(self, request, pk=None):
         if pk not in FEATURE_TYPES:
             raise Http404
         serializer = FeatureTypeSerializer(FEATURE_TYPES[pk], context={'request': request})

src/c3nav/settings.py

@@ -178,9 +178,6 @@ USE_L10N = True
 USE_TZ = True
 
 REST_FRAMEWORK = {
-    'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.NamespaceVersioning',
-    'ALLOWED_VERSIONS': ['v1'],
-    'DEFAULT_VERSION': 'v1',
     'DEFAULT_AUTHENTICATION_CLASSES': (
         'c3nav.api.authentication.ForceCSRFCheckSessionAuthentication',
     ),