encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-26 19:43:59 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,297 Commits 18 Branches 132 Tags 105 MiB
5802dc0f98
Commit Graph

131 Commits

Author SHA1 Message Date
Tom Christie
0ba94d7595 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-11-25 16:07:14 +00:00
José Padilla
e1b8412eed Add markdown and PyYAML to tox test requirements 2014-11-25 09:22:29 -04:00
Dougal Matthews
04abe9830c Add a docs build to the Tox run 2014-11-25 12:42:39 +00:00
Tymur Maryokhin
c559ec6da8 Removed dots in Django versions in tox. Refs #2124. 2014-11-25 12:03:54 +01:00
Tymur Maryokhin
b6de2660ea Added python 3.2 to test against django master . Related to #2075. 2014-11-25 11:09:36 +01:00
Tymur Maryokhin
585054f012 Streamlined tox config with 1.8 features 2014-11-25 10:57:46 +01:00
Tom Christie
b001a146d7 Add django master to build matrix. Closes #2075. 2014-11-17 09:56:20 +00:00
Tom Christie
0e59c27e2f Merge branch 'master' into version-3.0 2014-10-31 15:19:40 +00:00
José Padilla
8af3d5db49 Use PYTHONDONTWRITEBYTECODE=1 on tox environment 
This fixes bad marshal data errors after running
tests with tox and later running tests manually
via runtests.py. Fixes #1957
 2014-10-28 16:58:25 -04:00
Tom Christie
dee3f78cb6 FileField and ImageField 2014-09-26 17:06:20 +01:00
Jharrod LaFon
afaa52a378 Removes OAuth dependencies from tox configurations 2014-09-05 15:42:29 -07:00
José Padilla
fc250bf74b Test with released Django 1.7 2014-09-03 09:58:21 -07:00
Tom Christie
19f3134062 Add flake8 to requirements 2014-08-19 13:42:01 +01:00
Tom Christie
bf09c32de8 Code linting and added runtests.py 2014-08-19 13:28:07 +01:00
Tom Christie
e385a7b8eb Merge master 2014-08-19 10:11:10 +01:00
Xavier Ordoquy
0cbdbd24e5 Updated the tox file. 2014-07-28 13:54:43 +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
b370fb40b6 Typo in the Python version. 2014-05-16 01:06:34 +02:00
Xavier Ordoquy
e5556079fc Updated tox with Python 2.4 2014-05-16 00:50:16 +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
56b4390316 Merge remote-tracking branch 'origin/master' into 2.4.0 
Conflicts:
	.travis.yml
	rest_framework/serializers.py
	rest_framework/tests/test_authentication.py
 2014-04-30 22:21:26 +02:00
Xavier Ordoquy
4a1ef6d4b1 Updated Django's versions. 2014-04-27 11:52:33 +02:00
Xavier Ordoquy
f22ed49c64 Upgraded to pytest-django 2.6.1 2014-04-17 11:09:02 +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
Xavier Ordoquy
d08536ad9d Merge remote-tracking branch 'origin/master' into 2.4.0 
Conflicts:
	.travis.yml
	docs/api-guide/fields.md
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/authentication.py
	rest_framework/serializers.py
	rest_framework/templatetags/rest_framework.py
	rest_framework/tests/test_authentication.py
	rest_framework/tests/test_filters.py
	rest_framework/tests/test_hyperlinkedserializers.py
	rest_framework/tests/test_serializer.py
	rest_framework/tests/test_testing.py
	rest_framework/utils/encoders.py
	tox.ini
 2014-04-13 00:05:57 +02:00
Xavier Ordoquy
2a27674a79 Aligned the django-filter version with travis builds. 2014-03-23 15:40:42 +01:00
Xavier Ordoquy
b04cd57050 Bumped tests against Django from 1.7a2 to 1.7b1 2014-03-21 16:37:27 +01:00
Tom Christie
6cf19fa4ef Add Django 1.7 to tox 2014-03-07 14:16:31 +00:00
Tom Christie
4001cd74ed Pin pillow to 2.3.0 2014-03-07 14:15:56 +00: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
Tom Christie
52686420f4 Merge branch 'bennbollay-patch-1' into 2.4.0 
Conflicts:
	.travis.yml
	docs/api-guide/routers.md
	rest_framework/compat.py
	tox.ini
 2013-12-23 09:48:59 +00:00
Tom Christie
9c41c007af Merge branch 'master' into 2.4.0 
Conflicts:
	.travis.yml
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/compat.py
 2013-12-13 16:32:34 +00:00
Philip Forget
4b947a6a2a update requirements for django-oauth-plus to 2.2.1 2013-11-15 12:18:22 -05:00
Bruno Renié
1296753b5c Updated versions in tox and travis config 2013-11-08 11:58:14 +01:00
Tom Christie
e441f85109 Drop 1.3 support 2013-09-25 10:30:04 +01:00
bwreilly
b07de86ad3 some properly failing tests, set up for standard permissions 2013-09-06 12:35:06 -05:00
Tom Christie
2ca243a114 Fix up tests and tox 2013-06-05 13:20:06 +01:00
Tom Christie
b10869a08b Add Django 1.6 to docs and to tox 2013-06-02 21:14:02 +01:00
Tom Christie
73ab7dc3f1 Use django-filter 0.6a1 and add database query count tests for paginated, filtered lists. 2013-03-13 12:45:54 +00:00
Tom Christie
a4b33992a5 Merge OAuth2 work. 2013-03-07 17:43:13 +00:00
Tom Christie
d4e3610e71 Merge & clean OAuth support 2013-03-07 09:01:53 +00:00
Pierre Dulac
5a56f92abf Update the package dependency url style in tox.ini 2013-03-06 22:42:36 +01:00
Pierre Dulac
6f5764105b Use the PyPI django-oauth2-provider version 2013-03-06 19:15:33 +01:00
Tom Christie
1106596c80 Clean ups to datetime formatting 2013-03-06 12:19:39 +00:00
Tom Christie
6e6f6f2c7d Update for Django 1.5 2013-02-27 21:14:40 +00:00
Tom Christie
dcee027fa9 defusedxml for security fix. 
As per:
http://blog.python.org/2013/02/announcing-defusedxml-fixes-for-xml.html
 2013-02-22 13:17:22 +00:00
Tom Christie
00752dcd2a Py3k cleanup 2013-02-01 15:07:51 +00:00
Tom Christie
f4f237e3ee 3.2, 3.3 compat 2013-02-01 14:03:28 +00:00
Tom Christie
c27295dcbd Update minor Django versions in tox 2012-12-19 23:12:57 +00:00
Tom Christie
2f2bde69e4 Docs, tox and travis use django-filter 0.5.4 2012-11-16 20:58:49 +00:00
Ben Konrath
40c24a5ab0 Add django-filter to tox.ini. 2012-11-01 20:11:50 +01:00
Tom Christie
4ebd701be7 Fix serialization issue with Django 1.3 2012-09-28 14:53:22 +01:00
Tom Christie
ec3c0c288b Add py27 to tox 2012-09-27 13:01:49 +01:00
Tom Christie
d68684e26e Added tox.ini 2012-09-25 12:21:05 +01:00
Tom Christie
d40aaf404a Remove tox 2012-08-29 19:57:06 +01:00
Tom Christie
b2fcfffb3b django-staticfiles for Django 1.2 compatability 2012-01-31 09:05:52 +00:00
Tom Christie
243d80ccb0 Django 1.2 needs django-staticfiles 2012-01-30 16:05:13 +00:00
Tom Christie
e712ab0ba1 Added URLObject 2012-01-05 16:13:41 +00:00
Tom Christie
9f349ca6fe Rename examples in tox. 2012-01-02 18:37:41 +00:00
Tom Christie
1a72836edc Rename examples in tox. 2012-01-02 18:36:53 +00:00
Marko Tibold
23979a9953 Added django 1.4 aplha 1. 2011-12-30 13:42:01 +01:00
Marko Tibold
a3ddd9e4c9 Fix style consistency. 2011-12-21 01:24:16 +01:00
Marko Tibold
4b3c63f155 Make sure the optional markdown functionality is also tested. 2011-12-21 01:22:10 +01:00
Marko Tibold
0f16db7614 see previous commit message. 2011-12-15 00:31:57 +01:00
markotibold
f67c0651ba syncing dependencies. 2011-06-26 02:58:42 +02:00
markotibold
a880bf460a Danielfm packaged the 1.2 release so we can now install it from his repo. 2011-04-27 13:47:46 +02:00
tom christie tom@tomchristie.com
da7d49a384 tox can now use django 1.3 rather than 1.3-rc1. Huzzah. 2011-04-26 20:40:39 +01:00
tom christie tom@tomchristie.com
bdf4fef8b6 simplejson no longer a requirement for python 2.5 (uses django's built in simplejson lib) 2011-04-26 20:37:15 +01:00
markotibold
7f7be826e2 fixed bad naming of testenv 2011-03-20 10:30:53 +01:00
markotibold
e3b08c7f74 All should work fine now on jenkins. For some reason Tox with jenkins and env names of the form platform-djangoversion-examples results in an OSError Permission denied. No clue why. 2011-03-20 01:52:18 +01:00
markotibold
34c4585c6e testing jenkins 2011-03-20 01:40:26 +01:00
markotibold
d168f42b13 testing jenkins 2011-03-20 01:34:24 +01:00
markotibold
bc9a0a9a0f etsting jenkins 2011-03-20 00:43:15 +01:00
markotibold
1054944ba2 Tetss pass locally as well as under the jenkins user on the ci, but when jenins executes the tests we get OSError :-/ 2011-03-20 00:37:17 +01:00
markotibold
69036177bf oops 2011-03-19 03:09:31 +01:00
markotibold
9215197327 Adding examples to tox. Appears quite useful cause some example tests are broken. 2011-03-19 03:04:22 +01:00
markotibold
fabf7c255d Coverage for all platforms working. Had some trouble with dependencies of coverage of python-dev for the various platforms. 2011-03-18 14:15:12 +01:00
markotibold
5f2c53bf06 Test result graphing now possible for all 6 environments. Had to fix unittest-xml-reporting to work for both 1.2 and 1.3 to achieve this. The fix is reported to the owner of the project. 2011-03-17 01:02:34 +01:00
markotibold
e3011c1fb8 Implementing graphing. 2011-03-15 22:57:45 +01:00
Tom Christie
bed7d8c3a9 tox, runcoverage, and setup.py test 2011-03-13 17:08:46 +00:00