Skip to content

Commit

Permalink
Bug 1453189 - Stop using deprecated django-filters 'Filter.name'
Browse files Browse the repository at this point in the history
Fixes dozens of deprecation warnings of form:
```
treeherder/webapp/api/jobs.py:41: DeprecationWarning: `Filter.name`
has been renamed to `Filter.field_name`. See:
https://django-filter.readthedocs.io/en/develop/migration.html
  id = django_filters.NumberFilter(name='id')
```
  • Loading branch information
edmorley committed Apr 11, 2018
1 parent a613cd6 commit 1862884
Showing 1 changed file with 29 additions and 29 deletions.
58 changes: 29 additions & 29 deletions treeherder/webapp/api/jobs.py
Expand Up @@ -39,42 +39,42 @@ class JobFilter(django_filters.FilterSet):
We use this gigantic class to provide the same filtering interface
as the previous jobs API
"""
id = django_filters.NumberFilter(name='id')
id__in = NumberInFilter(name='id', lookup_expr='in')
tier__in = NumberInFilter(name='tier', lookup_expr='in')
push_id__in = NumberInFilter(name='push_id', lookup_expr='in')
job_guid = django_filters.CharFilter(name='guid')
job_guid__in = CharInFilter(name='guid', lookup_expr='in')
id = django_filters.NumberFilter(field_name='id')
id__in = NumberInFilter(field_name='id', lookup_expr='in')
tier__in = NumberInFilter(field_name='tier', lookup_expr='in')
push_id__in = NumberInFilter(field_name='push_id', lookup_expr='in')
job_guid = django_filters.CharFilter(field_name='guid')
job_guid__in = CharInFilter(field_name='guid', lookup_expr='in')
build_architecture = django_filters.CharFilter(
name='build_platform__architecture')
field_name='build_platform__architecture')
build_os = django_filters.CharFilter(
name='build_platform__os_name')
field_name='build_platform__os_name')
build_platform = django_filters.CharFilter(
name='build_platform__platform')
field_name='build_platform__platform')
build_system_type = django_filters.CharFilter(
name='signature__build_system_type')
field_name='signature__build_system_type')
job_group_id = django_filters.NumberFilter(
name='job_group_id')
field_name='job_group_id')
job_group_name = django_filters.CharFilter(
name='job_group__name')
field_name='job_group__name')
job_group_symbol = django_filters.CharFilter(
name='job_group__symbol')
field_name='job_group__symbol')
job_type_name = django_filters.CharFilter(
name='job_type__name')
field_name='job_type__name')
job_type_symbol = django_filters.CharFilter(
name='job_type__symbol')
field_name='job_type__symbol')
machine_name = django_filters.CharFilter(
name='machine__name')
field_name='machine__name')
machine_platform_architecture = django_filters.CharFilter(
name='machine_platform__architecture')
field_name='machine_platform__architecture')
machine_platform_os = django_filters.CharFilter(
name='machine_platform__os_name')
field_name='machine_platform__os_name')
platform = django_filters.CharFilter(
name='machine_platform__platform')
field_name='machine_platform__platform')
ref_data_name = django_filters.CharFilter(
name='signature__name')
field_name='signature__name')
signature = django_filters.CharFilter(
name='signature__signature')
field_name='signature__signature')

class Meta:
model = Job
Expand Down Expand Up @@ -531,14 +531,14 @@ def filter(self, qs, value):

return django_filters.Filter.filter(self, qs, value)

job_id = django_filters.NumberFilter(name='job')
job_id__in = NumberInFilter(name='job', lookup_expr='in')
job_guid = django_filters.CharFilter(name='job__guid')
job__guid = django_filters.CharFilter(name='job__guid') # for backwards compat
title = django_filters.CharFilter(name='title')
value = django_filters.CharFilter(name='value')
push_id = django_filters.NumberFilter(name='job__push')
repository = django_filters.CharFilter(name='job__repository__name')
job_id = django_filters.NumberFilter(field_name='job')
job_id__in = NumberInFilter(field_name='job', lookup_expr='in')
job_guid = django_filters.CharFilter(field_name='job__guid')
job__guid = django_filters.CharFilter(field_name='job__guid') # for backwards compat
title = django_filters.CharFilter(field_name='title')
value = django_filters.CharFilter(field_name='value')
push_id = django_filters.NumberFilter(field_name='job__push')
repository = django_filters.CharFilter(field_name='job__repository__name')

class Meta:
model = JobDetail
Expand Down

0 comments on commit 1862884

Please sign in to comment.