Tom Christie
63d02dbea8
Drop six from compat. 1.4.2 is now the lowest supported version.
2014-08-19 17:06:55 +01:00
Tom Christie
5358243ca5
Merge pull request #1778 from linovia/bugfix/1398
...
Bugfix/1398
2014-08-19 16:16:02 +01:00
Xavier Ordoquy
06b6b96f93
Remove duplicated model declaration.
2014-08-19 16:32:30 +02:00
Tom Christie
d2795dd26d
Resolve linting issues
2014-08-19 13:54:52 +01:00
Tom Christie
bf09c32de8
Code linting and added runtests.py
2014-08-19 13:28:07 +01:00
Xavier Ordoquy
c9535c036b
Merged #1398 against 2.4 branch.
2014-08-19 11:12:36 +02:00
Tom Christie
e385a7b8eb
Merge master
2014-08-19 10:11:10 +01:00
Xavier Ordoquy
4876bec9f5
Merge remote-tracking branch 'origin/master' into 2.4.0
...
Conflicts:
rest_framework/fields.py
2014-07-26 00:06:56 +02:00
Xavier Ordoquy
2489e38a06
Merge remote-tracking branch 'origin/master' into 2.4.0
...
Conflicts:
.travis.yml
docs/api-guide/viewsets.md
rest_framework/serializers.py
rest_framework/throttling.py
tests/test_generics.py
tests/test_serializers.py
tox.ini
2014-06-23 14:02:45 +02:00
Xavier Ordoquy
e5441d845e
Use urls functions from django instead of compat.
2014-05-01 08:41:37 +02:00
Xavier Ordoquy
7b4463f739
Merge remote-tracking branch 'reference/2.4.0' into feature/pytest
...
Conflicts:
rest_framework/runtests/urls.py
tests/test_response.py
tox.ini
2014-05-01 08:01:38 +02:00
Xavier Ordoquy
2aca69a946
Merge remote-tracking branch 'reference/master' into feature/pytest
...
Conflicts:
tests/test_serializer.py
2014-04-30 22:24:01 +02:00
Xavier Ordoquy
1797a74e82
Merge remote-tracking branch 'pelme/pytest' into feature/pytest
...
Conflicts:
.travis.yml
rest_framework/runtests/runtests.py
tests/test_filters.py
tests/test_pagination.py
tox.ini
2014-04-17 09:53:44 +02:00
Andreas Pelme
971578ca34
Support for running the test suite with py.test
...
* Get rid of runtests.py
* Moved test code from rest_framework/tests and rest_framework/runtests to tests
* Invoke py.test from setup.py
* Invoke py.test from Travis
* Invoke py.test from tox
* Changed setUpClass to be just plain setUp in test_permissions.py
* Updated contribution guideline to show how to invoke py.test
2014-03-02 12:40:30 +01:00
