Use pytest instead of nosetests, for tox runs
This commit is contained in:
		
							parent
							
								
									8afc376636
								
							
						
					
					
						commit
						7d72a43ecd
					
				
					 2 changed files with 9 additions and 12 deletions
				
			
		
							
								
								
									
										2
									
								
								setup.py
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								setup.py
									
										
									
									
									
								
							| 
						 | 
					@ -128,6 +128,8 @@ extras = {
 | 
				
			||||||
        'fixture',                      # 1.5
 | 
					        'fixture',                      # 1.5
 | 
				
			||||||
        'mock',                         # 1.0.1
 | 
					        'mock',                         # 1.0.1
 | 
				
			||||||
        'nose',                         # 1.3.0
 | 
					        'nose',                         # 1.3.0
 | 
				
			||||||
 | 
					        'pytest',                       # 4.6.11
 | 
				
			||||||
 | 
					        'pytest-cov',                   # 2.12.1
 | 
				
			||||||
    ],
 | 
					    ],
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										19
									
								
								tox.ini
									
										
									
									
									
								
							
							
						
						
									
										19
									
								
								tox.ini
									
										
									
									
									
								
							| 
						 | 
					@ -1,35 +1,30 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[tox]
 | 
					[tox]
 | 
				
			||||||
envlist = py27, py35
 | 
					envlist = py27, py35, py37
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[testenv]
 | 
					[testenv]
 | 
				
			||||||
deps =
 | 
					 | 
				
			||||||
        coverage
 | 
					 | 
				
			||||||
        fixture
 | 
					 | 
				
			||||||
        mock
 | 
					 | 
				
			||||||
        nose
 | 
					 | 
				
			||||||
commands =
 | 
					commands =
 | 
				
			||||||
        pip install --upgrade pip
 | 
					        pip install --upgrade pip
 | 
				
			||||||
 | 
					        pip install --upgrade setuptools wheel
 | 
				
			||||||
        pip install --upgrade --upgrade-strategy eager Tailbone rattail[auth,bouncer,db] rattail-tempmon
 | 
					        pip install --upgrade --upgrade-strategy eager Tailbone rattail[auth,bouncer,db] rattail-tempmon
 | 
				
			||||||
        nosetests {posargs}
 | 
					        pytest {posargs}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[testenv:py27]
 | 
					[testenv:py27]
 | 
				
			||||||
commands =
 | 
					commands =
 | 
				
			||||||
        pip install --upgrade pip
 | 
					        pip install --upgrade pip
 | 
				
			||||||
 | 
					        pip install --upgrade setuptools wheel
 | 
				
			||||||
        pip install --upgrade --upgrade-strategy eager Tailbone rattail[auth,bouncer,db] rattail-tempmon SQLAlchemy-Utils<0.36.7 SQLAlchemy-Continuum<1.3.12
 | 
					        pip install --upgrade --upgrade-strategy eager Tailbone rattail[auth,bouncer,db] rattail-tempmon SQLAlchemy-Utils<0.36.7 SQLAlchemy-Continuum<1.3.12
 | 
				
			||||||
        nosetests {posargs}
 | 
					        pytest {posargs}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[testenv:coverage]
 | 
					[testenv:coverage]
 | 
				
			||||||
basepython = python3
 | 
					basepython = python3
 | 
				
			||||||
commands =
 | 
					commands =
 | 
				
			||||||
        pip install --upgrade pip
 | 
					        pip install --upgrade pip
 | 
				
			||||||
        pip install --upgrade --upgrade-strategy eager Tailbone rattail[auth,bouncer,db] rattail-tempmon
 | 
					        pip install --upgrade --upgrade-strategy eager Tailbone rattail[auth,bouncer,db] rattail-tempmon
 | 
				
			||||||
        nosetests {posargs:--with-coverage --cover-html-dir={envtmpdir}/coverage}
 | 
					        pytest --cov=tailbone --cov-report=html
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[testenv:docs]
 | 
					[testenv:docs]
 | 
				
			||||||
basepython = python3
 | 
					basepython = python3
 | 
				
			||||||
deps =
 | 
					 | 
				
			||||||
    Sphinx
 | 
					 | 
				
			||||||
    sphinx-rtd-theme
 | 
					 | 
				
			||||||
changedir = docs
 | 
					changedir = docs
 | 
				
			||||||
commands =
 | 
					commands =
 | 
				
			||||||
        pip install --upgrade pip
 | 
					        pip install --upgrade pip
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue