Skip to content

Clean up compat code #2200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lovelydinosaur merged 7 commits into from
Dec 5, 2014
Merged

Clean up compat code #2200

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f8fdfe5
Updated Django versions to match requirements
maryokhin Dec 3, 2014
09e59f2
Removed custom python_2_unicode_compatible. Closes #2183
maryokhin Dec 4, 2014
d54c67d
Removed custom StringIO, force_text, smart_text compat
maryokhin Dec 4, 2014
95af92c
Removed custom urlparse compat
maryokhin Dec 4, 2014
001884a
Removed unused compat code
maryokhin Dec 4, 2014
45dc44b
Merge branch 'master' of github.com:tomchristie/django-rest-framework
maryokhin Dec 4, 2014
d993018
Removed unused imports, pep8 fixes, typo fixes
maryokhin Dec 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Updated Django versions to match requirements
  • Loading branch information
@maryokhin
maryokhin committed Dec 3, 2014
commit f8fdfe5a9379bd72066f7ac3a05198271a74088a
6 changes: 3 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py27-flake8,
py27-{flake8,docs},
{py26,py27}-django14,
{py26,py27,py32,py33,py34}-django{15,16},
{py27,py32,py33,py34}-django{17,master}
Expand All @@ -10,8 +10,8 @@ commands = ./runtests.py --fast
setenv =
PYTHONDONTWRITEBYTECODE=1
deps =
django14: Django==1.4.16
django15: Django==1.5.11
django14: Django==1.4.11
django15: Django==1.5.5
django16: Django==1.6.8
django17: Django==1.7.1
djangomaster: https://github.com/django/django/zipball/master
Expand Down