mirror of
				https://github.com/encode/django-rest-framework.git
				synced 2025-11-04 09:57:55 +03:00 
			
		
		
		
	Updated Django versions.
This commit is contained in:
		
							parent
							
								
									5c12b07681
								
							
						
					
					
						commit
						a2e1024f8b
					
				
							
								
								
									
										18
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								.travis.yml
									
									
									
									
									
								
							| 
						 | 
					@ -8,10 +8,10 @@ python:
 | 
				
			||||||
  - "3.4"
 | 
					  - "3.4"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  - DJANGO="https://www.djangoproject.com/download/1.7b2/tarball/"
 | 
					  - DJANGO="https://www.djangoproject.com/download/1.7b4/tarball/"
 | 
				
			||||||
  - DJANGO="django==1.6.3"
 | 
					  - DJANGO="django==1.6.5"
 | 
				
			||||||
  - DJANGO="django==1.5.6"
 | 
					  - DJANGO="django==1.5.8"
 | 
				
			||||||
  - DJANGO="django==1.4.11"
 | 
					  - DJANGO="django==1.4.13"
 | 
				
			||||||
  - DJANGO="django==1.3.7"
 | 
					  - DJANGO="django==1.3.7"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
install:
 | 
					install:
 | 
				
			||||||
| 
						 | 
					@ -24,7 +24,7 @@ install:
 | 
				
			||||||
  - "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.5.4; fi"
 | 
				
			||||||
  - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.7; 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 [[ ${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.7b2/tarball/' ]]; 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.7b4/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=.
 | 
					  - export PYTHONPATH=.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
script:
 | 
					script:
 | 
				
			||||||
| 
						 | 
					@ -33,16 +33,16 @@ script:
 | 
				
			||||||
matrix:
 | 
					matrix:
 | 
				
			||||||
  exclude:
 | 
					  exclude:
 | 
				
			||||||
    - python: "2.6"
 | 
					    - python: "2.6"
 | 
				
			||||||
      env: DJANGO="https://www.djangoproject.com/download/1.7b2/tarball/"
 | 
					      env: DJANGO="https://www.djangoproject.com/download/1.7b4/tarball/"
 | 
				
			||||||
    - python: "3.2"
 | 
					    - python: "3.2"
 | 
				
			||||||
      env: DJANGO="django==1.4.11"
 | 
					      env: DJANGO="django==1.4.13"
 | 
				
			||||||
    - python: "3.2"
 | 
					    - python: "3.2"
 | 
				
			||||||
      env: DJANGO="django==1.3.7"
 | 
					      env: DJANGO="django==1.3.7"
 | 
				
			||||||
    - python: "3.3"
 | 
					    - python: "3.3"
 | 
				
			||||||
      env: DJANGO="django==1.4.11"
 | 
					      env: DJANGO="django==1.4.13"
 | 
				
			||||||
    - python: "3.3"
 | 
					    - python: "3.3"
 | 
				
			||||||
      env: DJANGO="django==1.3.7"
 | 
					      env: DJANGO="django==1.3.7"
 | 
				
			||||||
    - python: "3.4"
 | 
					    - python: "3.4"
 | 
				
			||||||
      env: DJANGO="django==1.4.11"
 | 
					      env: DJANGO="django==1.4.13"
 | 
				
			||||||
    - python: "3.4"
 | 
					    - python: "3.4"
 | 
				
			||||||
      env: DJANGO="django==1.3.7"
 | 
					      env: DJANGO="django==1.3.7"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user