7eb1211192 
								
							 
						 
						
							
							
								
								revert setuptools_scm addition introduced with  f22d14b105 
							
							
							
						 
						
							2015-09-17 12:58:04 +02:00  
				
					
						
							
							
								 
						
							
								0b3f1b4a7c 
								
							 
						 
						
							
							
								
								Create `_pytest.vendored_packages` and _pytest._pluggy  
							
							... 
							
							
							
							- Replace imports from "pluggy" to "_pytest._pluggy"
- Fallback to import "pluggy" from global namespace if
  not found in _pytest.vendored_packges 
							
						 
						
							2015-09-07 13:01:54 -03:00  
				
					
						
							
							
								 
						
							
								f22d14b105 
								
							 
						 
						
							
							
								
								Merge pull request  #879  from RonnyPfannschmidt/setuptools-scm  
							
							... 
							
							
							
							use setuptools_scm to determine the version 
							
						 
						
							2015-08-15 00:56:16 +01:00  
				
					
						
							
							
								 
						
							
								235f9da432 
								
							 
						 
						
							
							
								
								special-case _pytest.__init__ in genscript to avoid a python3 bug  
							
							
							
						 
						
							2015-07-27 11:33:27 +02:00  
				
					
						
							
							
								 
						
							
								00e1a2122a 
								
							 
						 
						
							
							
								
								Deprecate and warn about --genscript,  fixes   #730  
							
							
							
						 
						
							2015-07-25 15:10:22 +02:00  
				
					
						
							
							
								 
						
							
								df29120abe 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	_pytest/config.py
	_pytest/genscript.py
	_pytest/mark.py
	tox.ini 
							
						 
						
							2015-07-23 22:35:51 -03:00  
				
					
						
							
							
								 
						
							
								2f7d0f8bd9 
								
							 
						 
						
							
							
								
								Consider --color option in more places which deal with TerminalWriters  
							
							
							
						 
						
							2015-07-18 16:39:55 -03:00  
				
					
						
							
							
								 
						
							
								23538bcd31 
								
							 
						 
						
							
							
								
								- some more adaptation to most recent pluggy API  
							
							... 
							
							
							
							- avoid using pluggin underscore api
- show pluggy version in header
--HG--
branch : pluggy1 
							
						 
						
							2015-05-05 21:53:04 +02:00  
				
					
						
							
							
								 
						
							
								920b5afe45 
								
							 
						 
						
							
							
								
								now that we are going to have wheels, py source code might be not be installed  
							
							... 
							
							
							
							and the resulting genscript is useless
--HG--
branch : pluggy1 
							
						 
						
							2015-05-04 14:42:01 +02:00  
				
					
						
							
							
								 
						
							
								25963e0544 
								
							 
						 
						
							
							
								
								adapt pytest to pluggy's decoratorclass branch  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-04-29 16:40:52 +02:00  
				
					
						
							
							
								 
						
							
								5ee7ee0850 
								
							 
						 
						
							
							
								
								adapt pytest to using pluggy (current master)  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-04-29 16:40:51 +02:00  
				
					
						
							
							
								 
						
							
								745737e337 
								
							 
						 
						
							
							
								
								strike python2.5 from test code cc @flub  
							
							
							
						 
						
							2014-09-05 09:50:40 +02:00  
				
					
						
							
							
								 
						
							
								ccd67733fb 
								
							 
						 
						
							
							
								
								standard lib modules no longer required in freeze_includes() and updated docs  
							
							... 
							
							
							
							--HG--
branch : cx_freeze-support 
							
						 
						
							2014-08-11 20:20:41 -03:00  
				
					
						
							
							
								 
						
							
								5873ca5146 
								
							 
						 
						
							
							
								
								Merging with default  
							
							... 
							
							
							
							--HG--
branch : cx_freeze-support 
							
						 
						
							2014-08-11 20:07:11 -03:00  
				
					
						
							
							
								 
						
							
								d2903507d8 
								
							 
						 
						
							
							
								
								Moved freeze_includes() to genscript  
							
							... 
							
							
							
							--HG--
branch : cx_freeze-support 
							
						 
						
							2014-08-11 20:03:14 -03:00  
				
					
						
							
							
								 
						
							
								97b671057d 
								
							 
						 
						
							
							
								
								put some imports back to function-level and streamline py2/py3 compat in one place  
							
							
							
						 
						
							2014-08-01 10:12:53 +02:00  
				
					
						
							
							
								 
						
							
								5603a0cd4b 
								
							 
						 
						
							
							
								
								Removing py.std usage from _pytest  
							
							
							
						 
						
							2014-07-31 19:13:40 -03:00  
				
					
						
							
							
								 
						
							
								3b8935c533 
								
							 
						 
						
							
							
								
								remove dupped_stdout logic and related changes, also simplify pytest_runtest_* calls to not use a contextlib with-decorator anymore.  
							
							
							
						 
						
							2014-04-01 15:03:17 +02:00  
				
					
						
							
							
								 
						
							
								9777703e03 
								
							 
						 
						
							
							
								
								- turn on capturing before early conftest loading and make terminal writer  
							
							... 
							
							
							
							use the original stream.
- avoid resetting capture FDs/sys.stdout for each test by keeping capturing
  always turned on and looking at snapshotted capturing data during runtest
  and collection phases. 
							
						 
						
							2014-03-14 12:49:36 +01:00  
				
					
						
							
							
								 
						
							
								9fb2079458 
								
							 
						 
						
							
							
								
								replace py.test module references with pytest  
							
							... 
							
							
							
							The only remaining 'py.test' references are:
 * those referring to the 'py.test' executable
 * those in code explicitly testing py.test/pytest module compatibility
 * those in old CHANGES documentation
 * those in documentation generated based on external data
 * those in seemingly unfinished & unmaintained Japanese documentation
Minor stylistic changes and typo corrections made to documentation next to
several applied py.test --> pytest content changes. 
							
						 
						
							2014-01-18 12:31:33 +01:00  
				
					
						
							
							
								 
						
							
								2a7c79dbf5 
								
							 
						 
						
							
							
								
								make genscript provide information as to compatibility  
							
							... 
							
							
							
							(now that argparse is a dependency on python2.6) 
							
						 
						
							2013-07-26 08:59:31 +02:00  
				
					
						
							
							
								 
						
							
								a9f1f26a39 
								
							 
						 
						
							
							
								
								don't import stuff at genscript import time but rather when it is used  
							
							
							
						 
						
							2011-03-12 20:12:19 +01:00  
				
					
						
							
							
								 
						
							
								929291775e 
								
							 
						 
						
							
							
								
								flat is better than nested (cont'd):  
							
							... 
							
							
							
							- pytest.py is new module, making "python -m pytest" work always
- _pytest/*.py now contains core.py, hookspec and the plugins, no sub packages 
							
						 
						
							2010-11-13 11:10:45 +01:00