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

189 Commits

Author SHA1 Message Date
José Padilla
c811a51be7 Update Django versions after bugfix release 2016-03-05 11:28:28 -04:00
José Padilla
03c95c0e71 Update Django security releases 1.9.3 and 1.8.10 2016-03-02 11:04:53 -04:00
Carlton Gibson
296c567645 Drop EOL Django 1.7 2016-02-15 16:07:42 +01:00
Simon Charette
57608b937e Displayed warnings during test suite. 2016-02-04 13:58:50 -05:00
José Padilla
37d1d3e738 Update Django versions 2016-02-01 15:36:11 -04:00
Tom Christie
2ce3ab59a6 Merge pull request #3746 from linovia/feature/display_internal_pytest_warnings 
Display py.test internal warnings
 2016-01-14 15:25:41 +00:00
Xavier Ordoquy
c5003e8dc1 Update the Django-guardian version for Django 1.9 2015-12-21 18:02:24 +01:00
Xavier Ordoquy
a4ce897d28 Display py.test internal warnings 2015-12-16 13:27:40 +01:00
José Padilla
eba6229b24 Use latest release of Django 1.9 2015-12-01 21:44:22 -04:00
José Padilla
3bcb7dba8c Update Django versions 2015-11-24 14:23:14 -04:00
José Padilla
e2ac148367 Test against Django 1.9rc1 2015-11-17 09:58:55 -04:00
Ryan Hiebert
240eb672af Don't specify basepython 
tox automatically includes basepython definitions for all the common
python versions, and will recognize it in factors of envs in the
envlist.
 2015-11-05 12:12:29 -06:00
José Padilla
08a00ce46d Test against Django 1.8.6 2015-11-04 13:27:19 -04:00
Tom Christie
5b5d6f1d4b Test against Django 1.9 beta 2015-10-20 10:53:45 +01:00
Tom Christie
02e1f69d2b Django 1.9 support 2015-09-28 11:44:07 +01:00
Carlton Gibson
5c0dffa4f7 Remove Django 1.6 from test matrix 2015-09-22 15:39:51 +02:00
Carlton Gibson
524a28c6f8 Exclude Guardian testing against Django master 2015-09-22 15:14:25 +02:00
Carlton Gibson
8edb9d3c1f Drop testing against Django 1.5 2015-09-21 16:08:56 +02:00
Carlton Gibson
366dff4f26 Test Python 3.5 against Django master 2015-09-21 16:03:37 +02:00
Carlton Gibson
796baab86f Drop Pythons 3.2, 3.3 for Django master 
No longer supported
 2015-09-21 15:47:11 +02:00
José Padilla
01fa2647c9 Bump up maximum supported Django versions 2015-08-22 08:49:05 -04:00
Tymur Maryokhin
4e5da16961 Remove Django 1.4 compat code 2015-08-07 00:02:29 +02:00
Tom Christie
1df5844e67 Merge pull request #3208 from treyhunner/add-codecov 
Report test coverage via Codecov
 2015-08-03 17:13:46 +01:00
Tom Christie
c8ad0cce19 Bump minimum Django version to 1.5 2015-07-30 15:43:39 +01:00
Trey Hunner
cb257ec524 Measure code coverage in tox 2015-07-29 20:45:23 -07:00
José Padilla
b4ba8ef4d7 Setup isort for code style linting 2015-06-26 09:16:33 -04:00
José Padilla
b519407b57 Track maximum supported 1.7 and 1.8 versions 2015-06-22 16:04:52 -04:00
Xavier Ordoquy
a97cbd1d68 Merge pull request #2999 from linovia/feature/short_pytest_tracebacks 
Let py.test use the short traceback format.
 2015-06-02 16:24:47 +01:00
Xavier Ordoquy
87a523465b Let py.test use the short traceback format. 2015-06-02 10:49:47 +01:00
Nicolas Delaby
27fd48586e allow to pass arbitrary arguments to py.test 2015-06-02 09:19:18 +02:00
José Padilla
9844f652a9 Workaround for bug in pip 2015-04-04 22:18:52 -04:00
José Padilla
7228a0df75 Test against Django's master branch 2015-04-04 22:07:11 -04:00
Tymur Maryokhin
596093d494 Django 1.8 released 2015-04-02 10:50:53 +02:00
Tom Christie
331f48054c Try to resolve pep8 versioning clash. 2015-03-23 15:59:18 +00:00
Tom Christie
b3956bc591 Upgrade testing env name to django18beta 2015-02-26 13:23:05 +00:00
Tom Christie
e72428214c Formally upgrade suport to Django 1.8-beta 2015-02-26 12:53:24 +00:00
Tom Christie
9f4f9c9c9f Single source of truth for requirements 2015-02-17 12:46:55 +00:00
Tom Christie
fbb21caaaa Merge master 2015-02-09 20:43:50 +00:00
Tom Christie
7b639c0cd0 Drop django master from the build matrix. 
Currently always going to be a know failure case.
We can add it back when we start to consdier Django 1.9 support.
 2015-02-09 17:57:08 +00:00
Tom Christie
4ee4b4f2dc Merge master 2015-01-30 14:00:25 +00:00
Tom Christie
39f26c9eca Merge master 2015-01-23 14:28:59 +00:00
Carlton Gibson
bf0b331e8f Restore DF for Django 1.8 2015-01-23 15:21:51 +01:00
Tom Christie
e307fd289c Fix test matrix 2015-01-23 11:38:58 +00:00
Tom Christie
5eb6949e9f Drop django-filter from 1.8 2015-01-23 11:32:04 +00:00
Tom Christie
6065cdbd93 Merge master 2015-01-19 15:16:57 +00:00
David Muller
a82a4d0a09 Add Django 1.8 alpha to test matrix 2015-01-18 15:04:50 -08:00
David Muller
1421b057f7 Bump pytest version in tox.ini to 2.6.4 2015-01-18 14:48:23 -08:00
David Muller
eb91076886 Bump pytest-django version in tox.ini to 2.8.0 2015-01-18 14:47:37 -08:00
Tom Christie
0800866988 Fix broken 1.7.3. It's 1.7.2 - 1.7.3 is documented but not yet on PyPI. 2015-01-08 14:54:54 +00:00
Tom Christie
42c913334b Minimum 1.6.x version is 1.6.3 2015-01-08 14:51:08 +00:00
Tom Christie
f529f83d3c Minimum Django 1.5 version issue 1.5.6 2015-01-08 14:38:23 +00:00
Tom Christie
26131a7aea Fix dependancies 2014-12-12 15:59:11 +00:00
Tom Christie
baaa356489 Merge master 2014-12-12 15:37:43 +00:00
Tom Christie
3d6620c72a Merge 2014-12-03 23:24:06 +00:00
Tymur Maryokhin
f8fdfe5a93 Updated Django versions to match requirements 2014-12-04 00:03:08 +01:00
José Padilla
731c8421af Remove YAML support from core 2014-11-29 14:43:05 -04:00
José Padilla
0cc990792c Merge branch 'version-3.1' into oauth_as_package 
Conflicts:
	requirements-test.txt
	rest_framework/compat.py
	tests/settings.py
	tox.ini
 2014-11-28 12:14:40 -04:00
José Padilla
fceeecf1e2 Update to latest minor Django versions 2014-11-27 09:06:37 -04:00
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