openstack/deb-python-django-compressor
Code Issues Proposed changes

attempt to fix python 2.6 issues

Browse Source 
- by converting to Unix line endings
This commit is contained in:
Lucas Tan
2014-04-05 19:54:26 +08:00
parent 8a28cd0fb5
commit 2f70d032eb
3 changed files with 280 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compressor/offline/django.py
View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import # noqa from __future__ import absolute_import
import io import io
from types import MethodType from types import MethodType

2
compressor/offline/jinja2.py
View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import # noqa from __future__ import absolute_import
import io import io
import jinja2 import jinja2

14
tox.ini
View File

@@ -20,6 +20,16 @@ three =
BeautifulSoup4 BeautifulSoup4
jingo jingo
coffin coffin
three_two =
flake8
coverage
html5lib
mock
jinja2==2.6
lxml
BeautifulSoup4
jingo
coffin
[tox] [tox]
envlist = envlist =
@@ -54,7 +64,7 @@ deps =
basepython = python3.2 basepython = python3.2
deps = deps =
Django>=1.6,<1.7 Django>=1.6,<1.7
{[deps]three} {[deps]three_two}
[testenv:py27-1.6.X] [testenv:py27-1.6.X]
basepython = python2.7 basepython = python2.7
@@ -80,7 +90,7 @@ basepython = python3.2
deps = deps =
Django>=1.5,<1.6 Django>=1.5,<1.6
django-discover-runner django-discover-runner
{[deps]three} {[deps]three_two}
[testenv:py27-1.5.X] [testenv:py27-1.5.X]
basepython = python2.7 basepython = python2.7