Skip to content

Commit

Permalink
only 28 failing test on py3 :)
Browse files Browse the repository at this point in the history
  • Loading branch information
galuszkak authored and montiniz committed Oct 11, 2014
1 parent a20c98d commit 836d856
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 44 deletions.
24 changes: 0 additions & 24 deletions .tx/config

This file was deleted.

9 changes: 2 additions & 7 deletions djadmin2/filters.py
Expand Up @@ -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'),
(),
Expand All @@ -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):
Expand Down
8 changes: 8 additions & 0 deletions requirements.txt
@@ -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 changes: 3 additions & 0 deletions requirements_test.txt
@@ -0,0 +1,3 @@
-rrequirements.txt
pytest
pytest-django
17 changes: 4 additions & 13 deletions tox.ini
Expand Up @@ -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
Expand Down

0 comments on commit 836d856

Please sign in to comment.