Merge pull request #3666 from rtfd/humitos/django-pagination/upgrade

Upgrade django-pagination to a "maintained" fork

Author: humitos

readthedocs/settings/base.py

@@ -71,7 +71,7 @@ def INSTALLED_APPS(self):  # noqa
             'django.contrib.humanize',
 
             # third party apps
-            'linaro_django_pagination',
+            'dj_pagination',
             'taggit',
             'guardian',
             'django_gravatar',
@@ -131,7 +131,7 @@ def USE_PROMOS(self):  # noqa
         'django.middleware.csrf.CsrfViewMiddleware',
         'django.contrib.auth.middleware.AuthenticationMiddleware',
         'django.contrib.messages.middleware.MessageMiddleware',
-        'linaro_django_pagination.middleware.PaginationMiddleware',
+        'dj_pagination.middleware.PaginationMiddleware',
         'readthedocs.core.middleware.SubdomainMiddleware',
         'readthedocs.core.middleware.SingleVersionMiddleware',
         'corsheaders.middleware.CorsMiddleware',

requirements/pip.txt

@@ -57,6 +57,7 @@ django-annoying==0.10.1
 django-messages-extends==0.5
 djangorestframework-jsonp==1.0.2
 django-taggit==0.22.2
+dj-pagination==2.3.2
 
 # Docs
 sphinxcontrib-httpdomain==1.4.0
@@ -69,6 +70,3 @@ packaging==16.8
 # Commenting stuff
 django-cors-middleware==1.3.1
 nilsimsa==0.3.7
-
-# Pegged git requirements
-git+https://github.com/zyga/django-pagination.git@86caf15#egg=django_pagination-dev