b84fcbc85e 
								
							 
						 
						
							
							
								
								Merge pull request  #873  from hunse/fix-dev-versions  
							
							... 
							
							
							
							Allow non-integer version strings in `importorskip` 
							
						 
						
							2015-07-24 16:08:15 -03:00  
				
					
						
							
							
								 
						
							
								3cd19a7e45 
								
							 
						 
						
							
							
								
								Use monkeypatch for setting modules in tests  
							
							... 
							
							
							
							Instead of directly setting `sys.modules`. This ensures that they
get removed at the end of the test. 
							
						 
						
							2015-07-24 12:34:06 -04:00  
				
					
						
							
							
								 
						
							
								d104487282 
								
							 
						 
						
							
							
								
								importorskip: Allow non-integer version strings  
							
							... 
							
							
							
							Use `pkg_resources.parse_version` to parse version strings.
This can handle 'dev', 'rc', alpha and beta version strings,
among others. 
							
						 
						
							2015-07-24 12:34:06 -04:00  
				
					
						
							
							
								 
						
							
								35bbcc39a2 
								
							 
						 
						
							
							
								
								Interpret strings to "plugins" arg in pytest.main() as module names  
							
							... 
							
							
							
							See #855  
							
						 
						
							2015-07-23 23:37:09 -03:00  
				
					
						
							
							
								 
						
							
								ab9e246ab0 
								
							 
						 
						
							
							
								
								Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini files by default  
							
							... 
							
							
							
							As discussed in #82  
							
						 
						
							2015-07-23 23:21:07 -03: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  
				
					
						
							
							
								 
						
							
								5a17e797c7 
								
							 
						 
						
							
							
								
								Fix basepython for tox envs "doctesting" and "coveralls"  
							
							... 
							
							
							
							Because we are currently using "nighly" python for travis, which
uses python 3.6 as the default interpreter. This breaks the environments
listed above because "inspect.getargspec" has been removed in py36. 
							
						 
						
							2015-07-23 21:15:45 -03:00  
				
					
						
							
							
								 
						
							
								ce96973ed5 
								
							 
						 
						
							
							
								
								Merge pull request  #864  from pytest-dev/consider-color-yes-everywhere  
							
							... 
							
							
							
							Consider --color option in more places which deal with TerminalWriters 
							
						 
						
							2015-07-23 08:03:52 -03:00  
				
					
						
							
							
								 
						
							
								77844ec5f3 
								
							 
						 
						
							
							
								
								Fixed typo in CHANGELOG: "testdirs" -> "testpaths"  
							
							
							
						 
						
							2015-07-22 12:14:49 -03:00  
				
					
						
							
							
								 
						
							
								0e26de2218 
								
							 
						 
						
							
							
								
								Merge pull request  #867  from nicoddemus/autouse-yield-fixture-class  
							
							... 
							
							
							
							Fix autouse fixtures defined in a TestCase subclass 
							
						 
						
							2015-07-22 01:25:21 +02:00  
				
					
						
							
							
								 
						
							
								81f18f8a0f 
								
							 
						 
						
							
							
								
								Fix flakes  
							
							
							
						 
						
							2015-07-21 19:55:01 -03:00  
				
					
						
							
							
								 
						
							
								0769bb4898 
								
							 
						 
						
							
							
								
								Make pastebin use _pytest.config.create_terminal_writer  
							
							
							
						 
						
							2015-07-21 12:55:18 -03:00  
				
					
						
							
							
								 
						
							
								31cfbac1f4 
								
							 
						 
						
							
							
								
								Fix autouse fixtures defined in a TestCase subclass  
							
							
							
						 
						
							2015-07-20 19:28:54 -03:00  
				
					
						
							
							
								 
						
							
								045274e647 
								
							 
						 
						
							
							
								
								remove merge artifact  
							
							
							
						 
						
							2015-07-19 15:49:43 +02:00  
				
					
						
							
							
								 
						
							
								6af7172204 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							
							
						 
						
							2015-07-19 15:25:04 +02:00  
				
					
						
							
							
								 
						
							
								412b43b216 
								
							 
						 
						
							
							
								
								Merge pull request  #865  from nicoddemus/skipif-reason-multiple  
							
							... 
							
							
							
							Report correct reason when using multiple skip/xfail markers 
							
						 
						
							2015-07-19 15:14:47 +02:00  
				
					
						
							
							
								 
						
							
								de65737cb1 
								
							 
						 
						
							
							
								
								Fix flakes  
							
							
							
						 
						
							2015-07-18 18:23:17 -03:00  
				
					
						
							
							
								 
						
							
								953916df49 
								
							 
						 
						
							
							
								
								Report correct reason when using multiple skip/xfail markers  
							
							
							
						 
						
							2015-07-18 18:18:45 -03:00  
				
					
						
							
							
								 
						
							
								2f7d0f8bd9 
								
							 
						 
						
							
							
								
								Consider --color option in more places which deal with TerminalWriters  
							
							
							
						 
						
							2015-07-18 16:39:55 -03:00  
				
					
						
							
							
								 
						
							
								23aaa8a62c 
								
							 
						 
						
							
							
								
								Allow py35 to fail on Travis until it is properly supported (fix2)  
							
							... 
							
							
							
							Conflicts:
	.travis.yml 
							
						 
						
							2015-07-18 15:39:22 -03:00  
				
					
						
							
							
								 
						
							
								604a39f5ef 
								
							 
						 
						
							
							
								
								Allow py35 to fail on Travis until it is properly supported (fix2)  
							
							
							
						 
						
							2015-07-18 15:30:16 -03:00  
				
					
						
							
							
								 
						
							
								a5bc98136d 
								
							 
						 
						
							
							
								
								Allow py35 to fail on Travis until it is properly supported (fix)  
							
							
							
						 
						
							2015-07-18 15:18:57 -03:00  
				
					
						
							
							
								 
						
							
								7dab2e1efe 
								
							 
						 
						
							
							
								
								Allow py35 to fail on Travis until it is properly supported  
							
							
							
						 
						
							2015-07-18 14:46:36 -03:00  
				
					
						
							
							
								 
						
							
								da1d5712cf 
								
							 
						 
						
							
							
								
								Fix broken links  
							
							... 
							
							
							
							Fix  #857  
						
							2015-07-18 14:15:07 -03:00  
				
					
						
							
							
								 
						
							
								30ff723d57 
								
							 
						 
						
							
							
								
								Merge pull request  #859  from pytest-dev/py35fix-port  
							
							... 
							
							
							
							Py35fix port 
							
						 
						
							2015-07-18 13:53:11 -03:00  
				
					
						
							
							
								 
						
							
								e227950b06 
								
							 
						 
						
							
							
								
								Style fix  
							
							
							
						 
						
							2015-07-18 13:18:38 -03:00  
				
					
						
							
							
								 
						
							
								6719a818e7 
								
							 
						 
						
							
							
								
								Match .travis.yml env list to tox envs  
							
							... 
							
							
							
							Conflicts:
	.travis.yml 
							
						 
						
							2015-07-18 13:18:36 -03:00  
				
					
						
							
							
								 
						
							
								08432c3e97 
								
							 
						 
						
							
							
								
								No more failures  
							
							
							
						 
						
							2015-07-18 13:17:29 -03:00  
				
					
						
							
							
								 
						
							
								15497dcd77 
								
							 
						 
						
							
							
								
								OK, try running flakes with 2.7  
							
							
							
						 
						
							2015-07-18 13:16:47 -03:00  
				
					
						
							
							
								 
						
							
								8a0867c580 
								
							 
						 
						
							
							
								
								Try running flakes tests with Python 3.4  
							
							
							
						 
						
							2015-07-18 13:16:47 -03:00  
				
					
						
							
							
								 
						
							
								d4789f1ac4 
								
							 
						 
						
							
							
								
								Fix AST rewriting with starred expressions in function calls  
							
							
							
						 
						
							2015-07-18 13:16:47 -03:00  
				
					
						
							
							
								 
						
							
								26e7532756 
								
							 
						 
						
							
							
								
								Move Interrupted exception class out of Session  
							
							
							
						 
						
							2015-07-18 13:16:47 -03:00  
				
					
						
							
							
								 
						
							
								570c4cc55a 
								
							 
						 
						
							
							
								
								No Starred node type on Python 2  
							
							
							
						 
						
							2015-07-18 13:16:46 -03:00  
				
					
						
							
							
								 
						
							
								728d8fbdc5 
								
							 
						 
						
							
							
								
								generify  
							
							
							
						 
						
							2015-07-18 13:16:26 -03:00  
				
					
						
							
							
								 
						
							
								fad569ae1b 
								
							 
						 
						
							
							
								
								simplify + fix  
							
							
							
						 
						
							2015-07-18 13:16:26 -03:00  
				
					
						
							
							
								 
						
							
								a4dbb27fab 
								
							 
						 
						
							
							
								
								a test  
							
							
							
						 
						
							2015-07-18 13:16:26 -03:00  
				
					
						
							
							
								 
						
							
								ec5286ea8c 
								
							 
						 
						
							
							
								
								nigh  
							
							
							
						 
						
							2015-07-18 13:16:08 -03:00  
				
					
						
							
							
								 
						
							
								195afa0733 
								
							 
						 
						
							
							
								
								try isntall 35 on tox  
							
							
							
						 
						
							2015-07-18 13:16:08 -03:00  
				
					
						
							
							
								 
						
							
								8bde0c5957 
								
							 
						 
						
							
							
								
								allow faillure on 35  
							
							
							
						 
						
							2015-07-18 13:16:08 -03:00  
				
					
						
							
							
								 
						
							
								b18e6439bd 
								
							 
						 
						
							
							
								
								Ast Call signature changed on 3.5  
							
							... 
							
							
							
							fix issue 744 on bitbucket
port of merge request 296
https://bitbucket.org/pytest-dev/pytest/pull-request/296/astcall-signature-changed-on-35 
https://bitbucket.org/pytest-dev/pytest/issue/744/ 
Conflicts:
	CHANGELOG 
							
						 
						
							2015-07-18 13:15:46 -03:00  
				
					
						
							
							
								 
						
							
								5e0235946b 
								
							 
						 
						
							
							
								
								Merge pull request  #801  from Carreau/test-35  
							
							... 
							
							
							
							Support Python 3.5 
							
						 
						
							2015-07-18 11:30:36 +01:00  
				
					
						
							
							
								 
						
							
								360c09a1e7 
								
							 
						 
						
							
							
								
								appveyor scripts  
							
							
							
						 
						
							2015-07-16 21:21:55 -03:00  
				
					
						
							
							
								 
						
							
								85f7aa2f9b 
								
							 
						 
						
							
							
								
								appveyor integration  
							
							
							
						 
						
							2015-07-16 21:21:47 -03:00  
				
					
						
							
							
								 
						
							
								a7b4ed89da 
								
							 
						 
						
							
							
								
								Use functools.partial name explicitly and simplify the code a bit as asked in review  
							
							
							
						 
						
							2015-07-16 20:37:04 -03:00  
				
					
						
							
							
								 
						
							
								dcdc823dd2 
								
							 
						 
						
							
							
								
								Support for tests created with functools.partial  
							
							... 
							
							
							
							Fix  #811  
						
							2015-07-16 20:37:03 -03:00  
				
					
						
							
							
								 
						
							
								30e7104b05 
								
							 
						 
						
							
							
								
								Merge pull request  #845  from nicoddemus/tmpdir-improvements  
							
							... 
							
							
							
							Introduce tmpdir_factory session fixture 
							
						 
						
							2015-07-16 20:02:08 -03:00  
				
					
						
							
							
								 
						
							
								330de0a93d 
								
							 
						 
						
							
							
								
								Use a subdirectory in the TEMP directory to speed up tmpdir creation  
							
							... 
							
							
							
							Fix  #105  
						
							2015-07-16 19:50:49 -03:00  
				
					
						
							
							
								 
						
							
								aa25fb05a9 
								
							 
						 
						
							
							
								
								Make sure marks in subclasses don't change marks in superclasses  
							
							... 
							
							
							
							Fix  #842  
						
							2015-07-16 19:29:16 -03:00  
				
					
						
							
							
								 
						
							
								4462b83258 
								
							 
						 
						
							
							
								
								Style fix  
							
							
							
						 
						
							2015-07-16 11:04:36 -07:00  
				
					
						
							
							
								 
						
							
								94cdec2cfe 
								
							 
						 
						
							
							
								
								Update sidebar links from Bitbucket to GitHub  
							
							
							
						 
						
							2015-07-16 03:08:06 +00:00