diff --git a/recipe-server/normandy/recipes/api/v1/__init__.py b/recipe-server/normandy/recipes/api/v1/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/recipe-server/normandy/recipes/api/serializers.py b/recipe-server/normandy/recipes/api/v1/serializers.py similarity index 100% rename from recipe-server/normandy/recipes/api/serializers.py rename to recipe-server/normandy/recipes/api/v1/serializers.py diff --git a/recipe-server/normandy/recipes/api/views.py b/recipe-server/normandy/recipes/api/v1/views.py similarity index 99% rename from recipe-server/normandy/recipes/api/views.py rename to recipe-server/normandy/recipes/api/v1/views.py index ac61ad63..010a72f1 100755 --- a/recipe-server/normandy/recipes/api/views.py +++ b/recipe-server/normandy/recipes/api/v1/views.py @@ -23,7 +23,7 @@ from normandy.recipes.models import ( Recipe, RecipeRevision ) -from normandy.recipes.api.serializers import ( +from normandy.recipes.api.v1.serializers import ( ActionSerializer, ApprovalRequestSerializer, ClientSerializer, diff --git a/recipe-server/normandy/recipes/models.py b/recipe-server/normandy/recipes/models.py index 84e22e2a..9017851c 100755 --- a/recipe-server/normandy/recipes/models.py +++ b/recipe-server/normandy/recipes/models.py @@ -186,7 +186,7 @@ class Recipe(DirtyFieldsMixin, models.Model): return None def canonical_json(self): - from normandy.recipes.api.serializers import RecipeSerializer # Avoid circular import + from normandy.recipes.api.v1.serializers import RecipeSerializer # Avoid circular import data = RecipeSerializer(self).data return CanonicalJSONRenderer().render(data) diff --git a/recipe-server/normandy/recipes/tests/api/__init__.py b/recipe-server/normandy/recipes/tests/api/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/recipe-server/normandy/recipes/tests/api/v1/__init__.py b/recipe-server/normandy/recipes/tests/api/v1/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/recipe-server/normandy/recipes/tests/test_api.py b/recipe-server/normandy/recipes/tests/api/v1/test_api.py similarity index 100% rename from recipe-server/normandy/recipes/tests/test_api.py rename to recipe-server/normandy/recipes/tests/api/v1/test_api.py diff --git a/recipe-server/normandy/recipes/tests/test_serializers.py b/recipe-server/normandy/recipes/tests/api/v1/test_serializers.py similarity index 99% rename from recipe-server/normandy/recipes/tests/test_serializers.py rename to recipe-server/normandy/recipes/tests/api/v1/test_serializers.py index f899887d..5cbf8b7a 100644 --- a/recipe-server/normandy/recipes/tests/test_serializers.py +++ b/recipe-server/normandy/recipes/tests/api/v1/test_serializers.py @@ -11,7 +11,7 @@ from normandy.recipes.tests import ( LocaleFactory, RecipeFactory, ) -from normandy.recipes.api.serializers import ( +from normandy.recipes.api.v1.serializers import ( ActionSerializer, RecipeSerializer, SignedRecipeSerializer) diff --git a/recipe-server/normandy/recipes/urls.py b/recipe-server/normandy/recipes/urls.py index 9b5e57c4..07f2b2b9 100644 --- a/recipe-server/normandy/recipes/urls.py +++ b/recipe-server/normandy/recipes/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import url, include from normandy.base.api.routers import MixedViewRouter -from normandy.recipes.api.views import ( +from normandy.recipes.api.v1.views import ( ActionImplementationView, ActionViewSet, ApprovalRequestViewSet,