preparing for 1.8 pypi release

PYPI_README.rst

@@ -1,6 +1,6 @@
-===
+================================
 Django Rest Multiple Model View
-===
+================================
 
 drf-multiple-models provides an easy view (and mixin) for serializing multiple models in a single view.  It is built on top of (and meant to be an extension for) Django Rest Framework.
 
@@ -10,22 +10,24 @@ Installation
 
 1. Install the package from pip:
 
+    .. code-block:: python 
 
-pip install django-rest-multiple-models
-
+        pip install django-rest-multiple-models
 
 2. Make sure to add 'drf_multiple_model' to your INSTALLED_APPS:
 
+    .. code-block:: python 
 
-INSTALLED_APPS = (
-    ....
-    'drf_multiple_model',
-)
+        INSTALLED_APPS = (
+            ...
+            'drf_multiple_model',
+        )
 
+3. Then simply import the view into any views.py in which you'd want to use it:
 
-3.  Then simply import the view into any views.py in which you'd want to use it:
+    .. code-block:: python 
 
-from drf_multiple_model.views import MultipleModelAPIView
+        from drf_multiple_model.views import MultipleModelAPIView
 
 
 Usage

README.md

@@ -38,10 +38,10 @@ from drf_multiple_model.views import MultipleModelAPIView
 
 # Features
 
-* Send multiple serialized models as separate arrays or one merged list
+* Send multiple serialized models as separate arrays, one merged list, or a single JSON object
 * Sort different serialized models using shared fields
 * pagination (sort of)
-* Filtering -- either per queryset or on all queryset
+* Filtering -- either per queryset or on all querysets
 * custom model labeling
 
 For full configuration options, filtering tools, and more, see [the documentation](https://django-rest-multiple-models.readthedocs.org/en/latest/).

contributors.rst

@@ -2,7 +2,7 @@
 Contributors
 ============
 
-Project Maintainer and Fouder
+Project Maintainer and Founder
 =============================
 
 * Matt Nishi-Broach <matt@axiologue.org>

docs/release-notes.rst

@@ -2,6 +2,14 @@
 Release Notes
 =============
 
+1.8 (2016-09-04)
+==============
+
+* Added ``objectify`` property to return JSON object instead of an array (implemented by @ELIYAHUT123)
+* Added ``MultipleModelAPIViewSet`` for working with Viewsets (credit to Mike Hwang (@mehwang) for working out the implementation)
+* implemented tox for simultaneous testing of all relevant python/django combos
+* dropped support for Django 1.7 (based on Django Rest Frameworks's concurrent lack of support)
+
 1.7 (2016-06-09)
 ===============
 

docs/viewsets.rst

@@ -21,4 +21,4 @@ For user with ViewSets and Routers, **drf-multiple-model** provides the ``Multip
 
 **WARNING:** Because the MultipleModel views do not provide the ``queryset`` property, you **must** specify the ``base_name`` property when you register a ``MultipleModelAPIViewSet`` with a router. 
 
-The ``MultipleModelAPIViewSet`` has all the same configuration options as the ``MultipleModelAPIView`` object.  For more information, see the basic usage section. 
+The ``MultipleModelAPIViewSet`` has all the same configuration options as the ``MultipleModelAPIView`` object.  For more information, see the :doc:`basic usage <basic-usage>`  section. 

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='django-rest-multiple-models',
-    version='1.7.1',
+    version='1.8.0',
     packages=['drf_multiple_model'],
     include_package_data=True,
     license='MIT License',
@@ -25,8 +25,9 @@
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',