only 28 failing test on py3 :)

This commit is contained in:
Kamil Gałuszka 2014-09-29 18:20:57 +02:00 committed by montiniz
parent a20c98d6d4
commit 836d85668e
5 changed files with 17 additions and 44 deletions

View file

@ -1,24 +0,0 @@
[main]
host = https://www.transifex.com
lang_map = sr@latin:sr_Latn
[django-admin2.djadmin2po]
file_filter = djadmin2/locale/<lang>/LC_MESSAGES/django.po
source_file = djadmin2/locale/en/LC_MESSAGES/django.po
source_lang = en_US
type = PO
minimum_perc = 80
[django-admin2.example-app]
file_filter = example/blog/locale/<lang>/LC_MESSAGES/django.po
source_file = example/blog/locale/en/LC_MESSAGES/django.po
source_lang = en_US
type = PO
minimum_perc = 50
[django-admin2.example2-app]
file_filter = example2/polls/locale/<lang>/LC_MESSAGES/django.po
source_file = example2/polls/locale/en/LC_MESSAGES/django.po
source_lang = en_US
type = PO
minimum_perc = 50

View file

@ -88,7 +88,7 @@ def build_list_filter(request, model_admin, queryset):
filterset_dict = {}
for field_filter in filters:
filterset_dict[field_filter.name] = field_filter
fields = filterset_dict.keys()
fields = list(filterset_dict.keys())
filterset_dict['Meta'] = type(
type_str('Meta'),
(),
@ -97,12 +97,7 @@ def build_list_filter(request, model_admin, queryset):
'fields': fields,
},
)
return type(
type_str('%sFilterSet' % queryset.model.__name__),
(django_filters.FilterSet, ),
filterset_dict,
)(request.GET, queryset=queryset)
return type(type_str('%sFilterSet' % queryset.model.__name__),(django_filters.FilterSet, ),filterset_dict,)(request.GET, queryset=queryset)
def build_date_filter(request, model_admin, queryset):

8
requirements.txt Normal file
View file

@ -0,0 +1,8 @@
django-extra-views>=0.6.5
django-braces>=1.3.0
djangorestframework>=2.3.3
django-floppyforms>=1.1
django-filter>=0.7
django-crispy-forms>=1.3.2
django-debug-toolbar>=0.9.4
pytz==2014.7

3
requirements_test.txt Normal file
View file

@ -0,0 +1,3 @@
-rrequirements.txt
pytest
pytest-django

17
tox.ini
View file

@ -5,20 +5,11 @@ envlist = py27-dj1.6.x, py27-dj1.7.x, py33-dj1.6.x, py34-dj1.6.x,
skipsdist = True
[testenv]
commands = python setup.py test
deps =
django-extra-views>=0.6.5
django-braces>=1.3.0
djangorestframework>=2.3.3
django-floppyforms>=1.1
django-filter>=0.7
django-crispy-forms>=1.3.2
django-debug-toolbar>=0.9.4
pytest
pytest-django
commands = py.test []
deps = -rrequirements_test.txt
setenv=
DJANGO_SETTINGS_MODULE=example.settings
PYTHONPATH={toxinidir}
DJANGO_SETTINGS_MODULE = example.settings
PYTHONPATH = {toxinidir}/example
[testenv:py27-dj1.6.x]
basepython=python2.7