mirror of
				https://github.com/encode/django-rest-framework.git
				synced 2025-11-04 01:47:59 +03:00 
			
		
		
		
	updated tox and travis for django 2.1 alpha1
This commit is contained in:
		
							parent
							
								
									1ee3829a2f
								
							
						
					
					
						commit
						2634294667
					
				| 
						 | 
				
			
			@ -12,6 +12,7 @@ env:
 | 
			
		|||
    - DJANGO=1.10
 | 
			
		||||
    - DJANGO=1.11
 | 
			
		||||
    - DJANGO=2.0
 | 
			
		||||
    - DJANGO=2.1
 | 
			
		||||
    - DJANGO=master
 | 
			
		||||
 | 
			
		||||
matrix:
 | 
			
		||||
| 
						 | 
				
			
			@ -20,6 +21,7 @@ matrix:
 | 
			
		|||
      - { python: "3.6", env: DJANGO=master }
 | 
			
		||||
      - { python: "3.6", env: DJANGO=1.11 }
 | 
			
		||||
      - { python: "3.6", env: DJANGO=2.0 }
 | 
			
		||||
      - { python: "3.6", env: DJANGO=2.1 }
 | 
			
		||||
      - { python: "2.7", env: TOXENV=lint }
 | 
			
		||||
      - { python: "2.7", env: TOXENV=docs }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -38,10 +40,13 @@ matrix:
 | 
			
		|||
    exclude:
 | 
			
		||||
      - { python: "2.7", env: DJANGO=master }
 | 
			
		||||
      - { python: "2.7", env: DJANGO=2.0 }
 | 
			
		||||
      - { python: "2.7", env: DJANGO=2.1 }
 | 
			
		||||
      - { python: "3.4", env: DJANGO=master }
 | 
			
		||||
      - { python: "3.4", env: DJANGO=2.1 }
 | 
			
		||||
 | 
			
		||||
    allow_failures:
 | 
			
		||||
      - env: DJANGO=master
 | 
			
		||||
      - env: DJANGO=2.1
 | 
			
		||||
 | 
			
		||||
install:
 | 
			
		||||
    - pip install tox tox-travis
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								tox.ini
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								tox.ini
									
									
									
									
									
								
							| 
						 | 
				
			
			@ -3,6 +3,7 @@ envlist =
 | 
			
		|||
       {py27,py34,py35}-django110,
 | 
			
		||||
       {py27,py34,py35,py36}-django111,
 | 
			
		||||
       {py34,py35,py36}-django20,
 | 
			
		||||
       {py35,py36}-django21
 | 
			
		||||
       {py35,py36}-djangomaster,
 | 
			
		||||
       dist,lint,docs,readme,
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -11,6 +12,7 @@ DJANGO =
 | 
			
		|||
    1.10: django110
 | 
			
		||||
    1.11: django111
 | 
			
		||||
    2.0: django20
 | 
			
		||||
    2.1: django21
 | 
			
		||||
    master: djangomaster
 | 
			
		||||
 | 
			
		||||
[testenv]
 | 
			
		||||
| 
						 | 
				
			
			@ -23,6 +25,7 @@ deps =
 | 
			
		|||
        django110: Django>=1.10,<1.11
 | 
			
		||||
        django111: Django>=1.11,<2.0
 | 
			
		||||
        django20: Django>=2.0,<2.1
 | 
			
		||||
        django21: Django>=2.1a1,<2.2
 | 
			
		||||
        djangomaster: https://github.com/django/django/archive/master.tar.gz
 | 
			
		||||
        -rrequirements/requirements-testing.txt
 | 
			
		||||
        -rrequirements/requirements-optionals.txt
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user