mirror of
				https://github.com/encode/django-rest-framework.git
				synced 2025-11-04 09:57:55 +03:00 
			
		
		
		
	Use 1.7a2 for django 1.7 line and added django-guardian PR for python 3.x or django 1.7 tests.
This commit is contained in:
		
							parent
							
								
									5a662dd60e
								
							
						
					
					
						commit
						c61d311acb
					
				| 
						 | 
				
			
			@ -7,7 +7,7 @@ python:
 | 
			
		|||
  - "3.3"
 | 
			
		||||
 | 
			
		||||
env:
 | 
			
		||||
  - DJANGO="https://www.djangoproject.com/download/1.7a1/tarball/"
 | 
			
		||||
  - DJANGO="https://www.djangoproject.com/download/1.7a2/tarball/"
 | 
			
		||||
  - DJANGO="django==1.6"
 | 
			
		||||
  - DJANGO="django==1.5.5"
 | 
			
		||||
  - DJANGO="django==1.4.10"
 | 
			
		||||
| 
						 | 
				
			
			@ -22,6 +22,8 @@ install:
 | 
			
		|||
  - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-guardian==1.1.1; fi"
 | 
			
		||||
  - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4; fi"
 | 
			
		||||
  - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.7; fi"
 | 
			
		||||
  - "if [[ ${TRAVIS_PYTHON_VERSION::1} == '3' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi"
 | 
			
		||||
  - "if [[ ${DJANGO} == 'https://www.djangoproject.com/download/1.7a2/tarball/'' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi"
 | 
			
		||||
  - export PYTHONPATH=.
 | 
			
		||||
 | 
			
		||||
script:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user