Update directory structure

.gitignore

@@ -1,4 +1,6 @@
 __pycache__/
 *.egg-info/
 .coverage
-.idea/
+.idea/
+build/
+dist/

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/insung151/drf-nested-serializer.svg?branch=master)](https://travis-ci.org/insung151/drf-nested-serializer)
+[![Coverage Status](https://coveralls.io/repos/github/insung151/drf-nested-serializer/badge.svg?branch=master)](https://coveralls.io/github/insung151/drf-nested-serializer?branch=master)
 # DRF Nested Serializer
 Nested Serializer support for Django Rest Framework.
 

drf_nested_serializer/__init__.py

@@ -1,7 +1,3 @@
-__version__ = '0.0.1'
-
-try:
-    from .serializers import *
-except:
-    pass
+__version__ = '0.0.2'
 
+from .serializers import NestedModelSerializer

drf_nested_serializer/serializers.py

@@ -1,8 +1,7 @@
 from django.db import transaction, router
-from django.db.models import ManyToOneRel
 from django.db.models.fields.related_descriptors import ForwardOneToOneDescriptor
 from rest_framework import serializers
-from rest_framework.serializers import ListSerializer, BaseSerializer, ModelSerializer
+from rest_framework.serializers import ListSerializer, ModelSerializer
 
 
 def serializer_factory(model, serializer=serializers.ModelSerializer):

tests.py → run_tests.py

@@ -9,7 +9,7 @@
 sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
 
 DEFAULT_SETTINGS = dict(
-    ROOT_URLCONF='drf_nested_serializer.tests.urls',
+    ROOT_URLCONF='tests.urls',
     SECRET_KEY="38dh*skf8sjfhs287dh&^hd8&3hdg*j2&sd",
     DEBUG=True,
     DATABASES={
@@ -23,7 +23,7 @@
         'django.contrib.contenttypes',
         'django.contrib.staticfiles',
         'rest_framework',
-        'drf_nested_serializer.tests'
+        'tests'
     ]
 )
 
@@ -32,7 +32,7 @@ def run_tests():
     if not settings.configured:
         settings.configure(**DEFAULT_SETTINGS)
     django.setup()
-    failures = DiscoverRunner(failfast=False).run_tests(['drf_nested_serializer.tests'])
+    failures = DiscoverRunner(failfast=False).run_tests(['tests'])
     sys.exit(bool(failures))
 
 

setup.py

@@ -1,16 +1,17 @@
 from io import open
 
 from setuptools import setup, find_packages
-from drf_nested_serializer import __version__
 
 
 with open('README.md') as f:
     long_description = f.read()
 
+version = '0.0.2'
+
 
 setup(
     name='drf-nested-serializer',
-    version=__version__,
+    version=version,
     url='https://github.com/insung151/drf-nested-serializer',
     description='nested serializer for django-rest-framework',
     license='MIT',
@@ -29,5 +30,5 @@
         'Programming Language :: Python',
         'Topic :: Software Development',
     ],
-    test_suite='tests.run_tests'
+    test_suite='run_tests.run_tests'
 )

drf_nested_serializer/tests/models.py → tests/models.py

@@ -3,12 +3,6 @@
 
 class SimpleModel(models.Model):
     content = models.CharField(max_length=100)
-    key = models.OneToOneField(
-        'KeyModel',
-        on_delete=models.CASCADE,
-        blank=True, null=True,
-        related_name='simple_model'
-    )
 
 
 class O2ORelatedModel(models.Model):
@@ -35,7 +29,3 @@ class M2MRelatedModel(models.Model):
         related_name='m2m_models'
     )
     key = models.CharField(max_length=100)
-
-
-class KeyModel(models.Model):
-    key = models.CharField(max_length=100)

drf_nested_serializer/tests/serializers.py → tests/serializers.py

@@ -1,5 +1,5 @@
-from drf_nested_serializer.serializers import NestedModelSerializer
-from drf_nested_serializer.tests.models import SimpleModel
+from drf_nested_serializer import NestedModelSerializer
+from .models import SimpleModel
 
 
 class O2OSerializer(NestedModelSerializer):
@@ -9,13 +9,6 @@ class Meta:
         fields = '__all__'
 
 
-class O2OSerializer2(NestedModelSerializer):
-    class Meta:
-        model = SimpleModel
-        nested_fields = {'key': 'simple_model'}
-        fields = '__all__'
-
-
 class FKSerializer(NestedModelSerializer):
     class Meta:
         model = SimpleModel

drf_nested_serializer/tests/tests.py → tests/tests.py

@@ -3,8 +3,8 @@
 from django.test import TestCase, RequestFactory
 from rest_framework import status
 
-from drf_nested_serializer.tests.models import SimpleModel, O2ORelatedModel
-from drf_nested_serializer.tests.views import FKCreateAPIView, M2MCreateAPIView, O2OCreateAPIView, O2OCreateAPIView2
+from .models import SimpleModel, O2ORelatedModel
+from .views import FKCreateAPIView, M2MCreateAPIView, O2OCreateAPIView
 
 
 class DRFNestedSerializerTests(TestCase):

drf_nested_serializer/tests/urls.py → tests/urls.py

@@ -1,6 +1,6 @@
 from django.conf.urls import url
 
-from drf_nested_serializer.tests.views import O2OCreateAPIView
+from .views import O2OCreateAPIView
 
 urlpatterns = [
     url('', O2OCreateAPIView.as_view())

drf_nested_serializer/tests/views.py → tests/views.py

@@ -1,19 +1,14 @@
 from rest_framework.generics import CreateAPIView
 
-from drf_nested_serializer.tests.models import SimpleModel
-from drf_nested_serializer.tests.serializers import FKSerializer, M2MSerializer, O2OSerializer, O2OSerializer2
+from .models import SimpleModel
+from .serializers import FKSerializer, M2MSerializer, O2OSerializer
 
 
 class O2OCreateAPIView(CreateAPIView):
     serializer_class = O2OSerializer
     queryset = SimpleModel.objects.all()
 
 
-class O2OCreateAPIView2(CreateAPIView):
-    serializer_class = O2OSerializer2
-    queryset = SimpleModel.objects.all()
-
-
 class FKCreateAPIView(CreateAPIView):
     serializer_class = FKSerializer
     queryset = SimpleModel.objects.all()