Bump to 3.2.1

.travis.yml

@@ -4,6 +4,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 env:
   matrix:
     - DJANGO_VERSION=1.8

docs/changes.rst

@@ -1,25 +1,32 @@
 Version History
-===============
+***************
+
+.. _version_2_3_1:
+
+Version 2.3.1
+==============
+
+use extras_require for py2/3 differences
 
 .. _version_2_3_0:
 
 Version 2.3.0
--------------
+=============
 
 Add request object to context
 
 .. _version_2_0_4:
 
 Version 2.0.4
--------------
+=============
 
 This is a micro release to push minor fixes to a PyPI release.
 
 
 .. _version_2_0_2:
 
 Version 2.0.2
--------------
+=============
 
 This is an another micro release. There are no code changes (apart from
 setup.py). The only change is to make it pip-friendly by using new integration
@@ -29,7 +36,7 @@ mode with versiontools.
 
 
 Version 2.0.1
--------------
+=============
 
 This is a micro release. There are no code changes so there is no need to
 upgrade. The only changes are to documentation and infrastructure files.
@@ -42,13 +49,14 @@ The following changes are included:
 * Provide correct link to installation instructions
 * Fix documentation referencing all project name
 * Ignore vim swap files
-* Add templates from the test project to ``MANIFEST.in``
+* Add templates from the test project to MANIFEST.in
 
 
 .. _version_2_0:
 
 Version 2.0
------------
+===========
+
 
 * Revived the project as a fork of
   git://github.com/ericflo/django-pagination.git. The project now has a new
@@ -65,28 +73,28 @@ Version 2.0
 * Add support for custom pagination templates. You can now use the optional
   argument on paginate to use different template::
 
-      {% autopaginate obj_list %}
-      ...
-      {% paginate using "something/custom_template.html" %}
+    {% autopaginate obj_list %}
+    ...
+    {% paginate using "something/custom_template.html" %}
 
 * Pagination template has support for specific blocks. Those blocks are
-  ``previouslink``, ``pagelinks`` and ``nextlink``.  Make sure to base your template
-  on ``pagination/pagination.html`` end extend the blocks you care about.
+  'previouslink', 'pagelinks' and 'nextlink'.  Make sure to base your template
+  on pagination/pagination.html end extend the blocks you care about.
 
 * Add support for using multiple paginations on a single page. Simply use
   multiple autopaginate/paginate tags. The only limitation is that you must use
   paginate before using the next autopaginate tag. For an example see the test
   project and the example application inside.
 
 * Simplify building documentation. To build the documentation simply run
-  ``setup.py build_sphinx``. You will need sphinx installed obviously.
+  `setup.py build_sphinx`. You will need sphinx installed obviously.
 
-* Simplify running tests. To run tests just invoke ``setup.py test``. That's all!
+* Simplify running tests. To run tests just invoke `setup.py test`. That's all!
   This is based on the goodness of django-testproject that simplifies setting
   up helper projects just for testing.
 
 
 Version 1.0.7
--------------
+=============
 
 * Last release from previous upstream developer.

setup.py

@@ -36,7 +36,7 @@
 
 os.environ['DJANGO_SETTINGS_MODULE'] = 'dj_pagination.tests.settings'
 
-version = "2.3.0"
+version = "2.3.1"
 
 if sys.argv[-1] == 'publish':
     os.system('pip install -U twine wheel')
@@ -81,9 +81,8 @@
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
     ],
-    extras_require={
-        ':python_version < "3.0"': ['Django>=1.8,<2.0'],
-        ':python_version >= "3.0"': ['Django>=1.8'],
-    },
+    setup_requires=[
+        'django >= 1.8.0'
+    ],
     include_package_data=True,
 )