Merge pull request readthedocs#2501 from rpkilby/upgrade-django-filter

Upgrade django filter

Author: ericholscher

readthedocs/builds/filters.py

@@ -27,17 +27,17 @@ class VersionFilter(django_filters.FilterSet):
     project = django_filters.CharFilter(name='project__slug')
     # Allow filtering on slug= or version=
     slug = django_filters.CharFilter(label=_("Name"), name='slug',
-                                     lookup_type='exact')
+                                     lookup_expr='exact')
     version = django_filters.CharFilter(label=_("Version"), name='slug',
-                                        lookup_type='exact')
+                                        lookup_expr='exact')
 
     class Meta:
         model = Version
         fields = ['project', 'slug', 'version']
 
 
 class BuildFilter(django_filters.FilterSet):
-    date = django_filters.DateRangeFilter(label=_("Build Date"), name="date", lookup_type='range')
+    date = django_filters.DateRangeFilter(label=_("Build Date"), name="date", lookup_expr='range')
     type = django_filters.ChoiceFilter(label=_("Build Type"),
                                        choices=BUILD_TYPES)
 

readthedocs/projects/filters.py

@@ -44,17 +44,17 @@ class ProjectFilter(django_filters.FilterSet):
     """Project filter for filter views"""
 
     name = django_filters.CharFilter(label=_("Name"), name='name',
-                                     lookup_type='icontains')
+                                     lookup_expr='icontains')
     slug = django_filters.CharFilter(label=_("Slug"), name='slug',
-                                     lookup_type='icontains')
+                                     lookup_expr='icontains')
     pub_date = django_filters.DateRangeFilter(label=_("Created Date"),
                                               name="pub_date")
     repo = django_filters.CharFilter(label=_("Repository URL"), name='repo',
-                                     lookup_type='icontains')
+                                     lookup_expr='icontains')
     repo_type = django_filters.ChoiceFilter(
         label=_("Repository Type"),
         name='repo',
-        lookup_type='icontains',
+        lookup_expr='icontains',
         choices=REPO_CHOICES,
     )
 
@@ -65,7 +65,7 @@ class Meta:
 
 class DomainFilter(django_filters.FilterSet):
     project = django_filters.CharFilter(label=_("Project"), name='project__slug',
-                                        lookup_type='exact')
+                                        lookup_expr='exact')
 
     class Meta:
         model = Domain

readthedocs/templates/builds/build_list.html

@@ -45,7 +45,7 @@ <h3>
 
 <div id="build_list">
 
-        {% autopaginate filter 15 %}
+        {% autopaginate filter.qs 15 %}
 
         <!-- BEGIN builds list -->
         <div class="module">
@@ -67,9 +67,10 @@ <h3>
                       {% endfor %}
                       </select>
                     </li>
-                  </form>
-                </div>
+                  </ul>
+                </form>
               </div>
+            </div>
             {% endif %}
             {% endblock %}
 

readthedocs/templates/core/build_list_detailed.html

@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load static %}
 
-          {% for build in filter %}
+          {% for build in filter.qs %}
           <li class="module-item col-span">
             <div id="build-{{ build.id }}">
                 <a href="{{ build.get_absolute_url }}"><span id="build-state">{% if build.state != 'finished' %}{{ build.get_state_display }} {% else %} {% if build.success %}{% trans "Passed" %}{% else %}{% trans "Failed" %}{% endif %}{% endif %}</span>

readthedocs/templates/core/filter_list.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 
-        {% for obj in filter %}
+        {% for obj in filter.qs %}
         <li class="module-item col-span">
             <div id="obj-{{ obj.id }}">
                 <a href="{{ obj.get_absolute_url }}">

readthedocs/templates/core/project_details.html

@@ -32,7 +32,7 @@ <h3>{% trans "Versions" %}</h3>
 
     <div class="module-list-wrapper">
       <ul>
-      {% for version in filter|sort_version_aware %}
+      {% for version in filter.qs|sort_version_aware %}
         <li class="module-item col-span">
         {% if version.uploaded or version.built %}
           {# Link to the docs #}
@@ -70,7 +70,7 @@ <h3>{% trans "Build a version" %}</h3>
     <div class="version_right">
       <form method="post" action="{% url "generic_build" project.pk %}">
         <select id="id_version" name="version_slug">
-        {% for version in filter|sort_version_aware %}
+        {% for version in filter.qs|sort_version_aware %}
           <option value="{{ version.slug }}">{{ version.slug }}</option>
         {% endfor %}
         </select>

readthedocs/templates/core/version_list.html

@@ -1,6 +1,6 @@
 <div class="module-list-wrapper">
   <ul>
-  {% for version in filter %}
+  {% for version in filter.qs %}
     <li class="module-item">
       {# Link to the docs #}
       <a class="module-item-title" href="{{ version.get_absolute_url }}">{{ version.slug }}</a>

readthedocs/templates/filter.html

@@ -16,7 +16,7 @@
 {% block content %}
 
 
-          {% autopaginate filter 15 %}
+          {% autopaginate filter.qs 15 %}
 
           <!-- BEGIN builds list -->
           <div class="module">

readthedocs/templates/projects/project_dashboard_base.html

@@ -15,13 +15,13 @@
   <div class="col-major project-dashboard-right">
     {% if project_list %}
 
-      {% if filter|length > 0 %}
+      {% if filter.qs.count > 0 %}
         <div class="module-header">
           <h3>{% trans "Important Versions" %}</h3>
         </div>
 
         <div class="filter">
-          {% autopaginate filter 15 %}
+          {% autopaginate filter.qs 15 %}
 
           <!-- BEGIN filter list -->
           <div class="module">

readthedocs/templates/projects/project_version_list.html

@@ -36,7 +36,7 @@ <h3>Filters</h3>
         <h1>{% trans "Active Versions" %}</h1>
         <div class="module-list-wrapper">
           <ul>
-            {% for version in active_filter|sort_version_aware %}
+            {% for version in active_filter.qs|sort_version_aware %}
               {% block active-versions %}
               <li class="module-item">
                 {# Link to the docs #}
@@ -84,7 +84,7 @@ <h1>{% trans "Active Versions" %}</h1>
           <h1>{% trans "Inactive Versions" %}</h1>
           <div class="module-list-wrapper">
             <ul>
-              {% for version in inactive_filter|sort_version_aware %}
+              {% for version in inactive_filter.qs|sort_version_aware %}
 
               {% block inactive-versions %}
                 <li class="module-item">

requirements/pip.txt

@@ -56,7 +56,7 @@ docker-py==1.3.1
 django-textclassifier==1.0
 django-annoying==0.8.4
 django-messages-extends==0.5
-django-filter<1.0
+django-filter==1.0.0
 
 # Docs
 sphinxcontrib-httpdomain==1.4.0