Ryan P Kilby 
							
						 
					 
					
						
						
						
						
							
						
						
							a628a2dbce 
							
						 
					 
					
						
						
							
							Drop Django 1.10 support ( #5657 )  
						
						... 
						
						
						
						* Remove Django 1.10 from CI
* Remove Django 1.10 compat code 
						
					 
					
						2018-07-06 12:14:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Hahler 
							
						 
					 
					
						
						
						
						
							
						
						
							b23cdaff4c 
							
						 
					 
					
						
						
							
							tox/pytest: move posargs, use -ra ( #6039 )  
						
						... 
						
						
						
						- tox: move {posargs} to the end, so that it can override previous
  entries, e.g. `-ra` when `-rw` was used.
- pytest: add `-ra` to addopts: it is good to see a summary of skipped
  and failed tests at the end. 
						
					 
					
						2018-07-06 10:34:11 +02:00 
						 
				 
			
				
					
						
							
							
								Ryan P Kilby 
							
						 
					 
					
						
						
						
						
							
						
						
							1a170438d2 
							
						 
					 
					
						
						
							
							Add "optionals not required" build ( #6047 )  
						
						
						
					 
					
						2018-06-22 10:16:57 +02:00 
						 
				 
			
				
					
						
							
							
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							d778c5e51e 
							
						 
					 
					
						
						
							
							Update tox to use Django  v2.1b1 ( #6037 )  
						
						
						
					 
					
						2018-06-21 09:07:33 +02:00 
						 
				 
			
				
					
						
							
							
								Steven Loria 
							
						 
					 
					
						
						
						
						
							
						
						
							cf925caa48 
							
						 
					 
					
						
						
							
							Render markdown readme on PyPI ( #6004 )  
						
						... 
						
						
						
						* Render markdown readme on PyPI
PyPI now supports GitHub-flavored Markdown descriptions
(https://blog.thea.codes/github-flavored-markdown-on-pypi/ ),
so there's no need to convert the README to rst with pypandoc
any more.
* Remove readme checking
Checking markdown descriptions is not necessary.
See https://github.com/pypa/readme_renderer#markdown 
* Upgrade twine 
						
					 
					
						2018-06-03 19:21:04 +01:00 
						 
				 
			
				
					
						
							
							
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							2634294667 
							
						 
					 
					
						
						
							
							updated tox and travis for django 2.1 alpha1  
						
						
						
					 
					
						2018-05-23 16:33:15 +06:00 
						 
				 
			
				
					
						
							
							
								Daniel Hahler 
							
						 
					 
					
						
						
						
						
							
						
						
							4527a753cd 
							
						 
					 
					
						
						
							
							Move pytest config to setup.cfg ( #5979 )  
						
						... 
						
						
						
						Also adds `testspath` to improve test collection performance. 
						
					 
					
						2018-05-08 13:28:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Hahler 
							
						 
					 
					
						
						
						
						
							
						
						
							fd4282c7fa 
							
						 
					 
					
						
						
							
							pytest: use --strict ( #5966 )  
						
						... 
						
						
						
						This causes errors with invalid markers:
> AttributeError: 'skipUnless' not a registered marker
Fixed in https://github.com/encode/django-rest-framework/pull/5965 . 
						
					 
					
						2018-05-03 21:43:57 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan P Kilby 
							
						 
					 
					
						
						
						
						
							
						
						
							68519c092f 
							
						 
					 
					
						
						
							
							Test staticfiles ( #5701 )  
						
						... 
						
						
						
						* Remove 'MIDDLEWARE_CLASSES' compat setting
* Remove 'django.setup()' compat import
* Move '--no-pkgroot' handling to conftest
* Add staticfiles handling to dist build 
						
					 
					
						2018-01-02 11:35:56 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan P Kilby 
							
						 
					 
					
						
						
						
						
							
						
						
							d12005cf90 
							
						 
					 
					
						
						
							
							Add 'dist' build ( #5656 )  
						
						
						
					 
					
						2017-12-14 11:48:03 +01:00 
						 
				 
			
				
					
						
							
							
								Jon Dufresne 
							
						 
					 
					
						
						
						
						
							
						
						
							101d3d24f7 
							
						 
					 
					
						
						
							
							Update to use the Django 2.0 release in tox.ini  
						
						... 
						
						
						
						Was previously using a release candidate as the minimum version. 
						
					 
					
						2017-12-03 10:35:34 -08:00 
						 
				 
			
				
					
						
							
							
								Ryan P Kilby 
							
						 
					 
					
						
						
						
						
							
						
						
							fc6b192b70 
							
						 
					 
					
						
						
							
							Fix readme, add to CI ( #5625 )  
						
						... 
						
						
						
						* Add readme build to CI
* Fix pandoc import in setup.py
* Replace sponsor HTML with markdown
This loses the image centering, but can be converted to RST.
* Fix README RST conversion
- Links do not render correctly inside italics
- Add hr between image caption and section, fixes markup on older
  versions of pandoc. 
						
					 
					
						2017-11-27 11:32:17 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan P Kilby 
							
						 
					 
					
						
						
						
						
							
						
						
							1922dc6e73 
							
						 
					 
					
						
						
							
							Update Django to 2.0rc1  
						
						
						
					 
					
						2017-11-22 23:16:07 -05:00 
						 
				 
			
				
					
						
							
							
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							320f10ad00 
							
						 
					 
					
						
						
							
							update tox to django 2.0 beta1 ( #5507 )  
						
						
						
					 
					
						2017-10-17 08:58:09 +02:00 
						 
				 
			
				
					
						
							
							
								Carlton Gibson 
							
						 
					 
					
						
						
						
						
							
						
						
							296904099f 
							
						 
					 
					
						
						
							
							Update test matrix: Add Django 2.0, drop 1.8 ( #5457 )  
						
						... 
						
						
						
						* Add Django 2.0 to tox/travis.
Updated requirements
* Drop Django 1.8 & 1.9 
						
					 
					
						2017-09-27 10:29:48 +02:00 
						 
				 
			
				
					
						
							
							
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							2e546f02ba 
							
						 
					 
					
						
						
							
							update django 1.11 to stable release in tox  
						
						
						
					 
					
						2017-04-09 01:20:56 +06:00 
						 
				 
			
				
					
						
							
							
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							db4dd0c977 
							
						 
					 
					
						
						
							
							use django 1.11rc1 in tox  
						
						
						
					 
					
						2017-03-22 14:40:23 +06:00 
						 
				 
			
				
					
						
							
							
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							1a49318522 
							
						 
					 
					
						
						
							
							added django 1.11 beta 1 for testing  
						
						
						
					 
					
						2017-02-21 10:31:05 +06:00 
						 
				 
			
				
					
						
							
							
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							7d4706fbcc 
							
						 
					 
					
						
						
							
							remved python3.4 for django master as 3.5 is the min  
						
						
						
					 
					
						2017-01-18 14:04:30 +06:00 
						 
				 
			
				
					
						
							
							
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							d75b7761c8 
							
						 
					 
					
						
						
							
							re organized supported django versions and releases  
						
						
						
					 
					
						2017-01-18 13:54:42 +06:00 
						 
				 
			
				
					
						
							
							
								Ryan P Kilby 
							
						 
					 
					
						
						
						
						
							
						
						
							50c2d71a80 
							
						 
					 
					
						
						
							
							tox/travis maintenance ( #4811 )  
						
						... 
						
						
						
						* Use py36 on travis
* Remove basepython from tox
* Use py27 on travis
* Use version ranges for dependencies
* Use tox-travis to sync python/env factors
* Add toxenv/django env vars to codecov build vars
* Use raw string to fix py36 invalid escape sequence 
						
					 
					
						2017-01-16 13:51:07 +00:00 
						 
				 
			
				
					
						
							
							
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							1880f6e0a4 
							
						 
					 
					
						
						
							
							added python3.6 on tox ( #4794 )  
						
						
						
					 
					
						2017-01-08 16:06:06 +00:00 
						 
				 
			
				
					
						
							
							
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							cd6acfcfcf 
							
						 
					 
					
						
						
							
							updated django minor versions  
						
						
						
					 
					
						2017-01-05 16:30:04 +06:00 
						 
				 
			
				
					
						
							
							
								Angel Velasquez 
							
						 
					 
					
						
						
						
						
							
						
						
							ee60aaa945 
							
						 
					 
					
						
						
							
							Update versions of Django on tox.ini ( #4651 )  
						
						... 
						
						
						
						Bump release versions to 1.10.3, 1.9.11 and 1.8.16
More info on:
https://www.djangoproject.com/weblog/2016/nov/01/security-releases/  
						
					 
					
						2016-11-07 11:37:58 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0dec36eb41 
							
						 
					 
					
						
						
							
							Version 3.5 ( #4525 )  
						
						... 
						
						
						
						* Start test case
* Added 'requests' test client
* Address typos
* Graceful fallback if requests is not installed.
* Add cookie support
* Tests for auth and CSRF
* Py3 compat
* py3 compat
* py3 compat
* Add get_requests_client
* Added SchemaGenerator.should_include_link
* add settings for html cutoff on related fields
* Router doesn't work if prefix is blank, though project urls.py handles prefix
* Fix Django 1.10 to-many deprecation
* Add django.core.urlresolvers compatibility
* Update django-filter & django-guardian
* Check for empty router prefix; adjust URL accordingly
It's easiest to fix this issue after we have made the regex.  To try
to fix it before would require doing something different for List vs
Detail, which means we'd have to know which type of url we're
constructing before acting accordingly.
* Fix misc django deprecations
* Use TOC extension instead of header
* Fix deprecations for py3k
* Add py3k compatibility to is_simple_callable
* Add is_simple_callable tests
* Drop python 3.2 support (EOL, Dropped by Django)
* schema_renderers= should *set* the renderers, not append to them.
* API client (#4424 )
* Fix release notes
* Add note about 'User account is disabled.' vs 'Unable to log in'
* Clean up schema generation (#4527 )
* Handle multiple methods on custom action (#4529 )
* RequestsClient, CoreAPIClient
* exclude_from_schema
* Added 'get_schema_view()' shortcut
* Added schema descriptions
* Better descriptions for schemas
* Add type annotation to schema generation
* Coerce schema 'pk' in path to actual field name
* Deprecations move into assertion errors
* Use get_schema_view in tests
* Updte CoreJSON media type
* Handle schema structure correctly when path prefixs exist. Closes  #4401 
* Add PendingDeprecation to Router schema generation.
* Added SCHEMA_COERCE_PATH_PK and SCHEMA_COERCE_METHOD_NAMES
* Renamed and documented 'get_schema_fields' interface. 
						
					 
					
						2016-10-10 13:03:46 +01:00 
						 
				 
			
				
					
						
							
							
								Angel Velasquez 
							
						 
					 
					
						
						
						
						
							
						
						
							b8fcb7807a 
							
						 
					 
					
						
						
							
							Update Django security release 1.10.2  
						
						
						
					 
					
						2016-10-02 03:11:40 -03:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							38aa0ac281 
							
						 
					 
					
						
						
							
							Update Django security releases 1.9.10 and 1.8.15  
						
						
						
					 
					
						2016-09-28 00:05:22 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							296e47a9f8 
							
						 
					 
					
						
						
							
							Update from Django 1.10 beta to Django 1.10 ( #4344 )  
						
						
						
					 
					
						2016-08-02 10:23:56 +01:00 
						 
				 
			
				
					
						
							
							
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							71cdda9399 
							
						 
					 
					
						
						
							
							updated minor django versions  
						
						
						
					 
					
						2016-07-19 11:31:29 +06:00 
						 
				 
			
				
					
						
							
							
								José Padilla 
							
						 
					 
					
						
						
						
						
							
						
						
							a20a75636c 
							
						 
					 
					
						
						
							
							Test against Django 1.10b1 ( #4210 )  
						
						... 
						
						
						
						* Test against Django 1.10b1
* Test against Django master 
						
					 
					
						2016-06-23 14:12:51 +01:00 
						 
				 
			
				
					
						
							
							
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							d54082c4a7 
							
						 
					 
					
						
						
							
							upgraded django to 1.9.7 release  
						
						
						
					 
					
						2016-06-05 12:12:38 +06:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							994e1ba927 
							
						 
					 
					
						
						
							
							Django 1.10 support. ( #4158 )  
						
						... 
						
						
						
						* Added TEMPLATES setting to tests
* Remove deprecated view-string in URL conf
* Replace 'urls = ...' in test classes with override_settings('ROOT_URLCONF=...')
* Refactor UsingURLPatterns to use override_settings(ROOT_URLCONF=...) style
* Get model managers and names in a version-compatible manner.
* Apply override_settings to a TestCase, not a mixin class
* Use '.callback' property instead of private attributes when inspecting urlpatterns
* Pass 'user' to template explicitly
* Correct sorting of import statements.
* Remove unused TEMPLATE_LOADERS setting, in favor of TEMPLATES.
* Remove code style issue
* BaseFilter test requires a concrete model
* Resolve tox.ini issues
* Resolve isort differences between local and tox environments 
						
					 
					
						2016-06-01 15:31:00 +01:00 
						 
				 
			
				
					
						
							
							
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							35ace2e9ec 
							
						 
					 
					
						
						
							
							django 1.10 support initials ( #4144 )  
						
						... 
						
						
						
						* added django 1.10 alpha on tox
* added django 1.10 alpha on travis
* added allow_failure on travis matrix 
						
					 
					
						2016-05-25 20:07:21 +01:00 
						 
				 
			
				
					
						
							
							
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							5f52c4ff3e 
							
						 
					 
					
						
						
							
							added python3.5 for django 1.8 checks  
						
						
						
					 
					
						2016-05-03 15:52:05 +06:00 
						 
				 
			
				
					
						
							
							
								Asif Saifuddin Auvi 
							
						 
					 
					
						
						
						
						
							
						
						
							04ebb1ef04 
							
						 
					 
					
						
						
							
							upgraded minor django version n tox  
						
						
						
					 
					
						2016-05-03 09:50:52 +06:00 
						 
				 
			
				
					
						
							
							
								auvipy 
							
						 
					 
					
						
						
						
						
							
						
						
							5cc6c254d5 
							
						 
					 
					
						
						
							
							updated minor django versions on tox  
						
						
						
					 
					
						2016-04-02 23:02:44 +06:00 
						 
				 
			
				
					
						
							
							
								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