a280e43949 
								
							 
						 
						
							
							
								
								fix import error  
							
							
							
						 
						
							2017-04-26 15:57:55 +02:00  
				
					
						
							
							
								 
						
							
								e02cb6d7ce 
								
							 
						 
						
							
							
								
								restore setuptools_scm write_to usage  
							
							
							
						 
						
							2017-04-23 16:59:08 +02:00  
				
					
						
							
							
								 
						
							
								4242bf6262 
								
							 
						 
						
							
							
								
								use unknown to specify unknown versions  
							
							
							
						 
						
							2017-04-20 21:46:58 +02:00  
				
					
						
							
							
								 
						
							
								2cf422733c 
								
							 
						 
						
							
							
								
								restore linting, drop _pytest._version for check-manifest  
							
							
							
						 
						
							2017-04-19 20:25:53 +02:00  
				
					
						
							
							
								 
						
							
								c3aee4b1e6 
								
							 
						 
						
							
							
								
								second take at setuptools_scm  
							
							... 
							
							
							
							since setuptools 18.6 fixes the issues with develop installs
https://github.com/pypa/setuptools/blob/master/CHANGES.rst#186 
https://github.com/pypa/setuptools/issues/439  
							
						 
						
							2017-04-19 19:40:42 +02:00  
				
					
						
							
							
								 
						
							
								f5d900d972 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2016-09-01 23:07:49 -03:00  
				
					
						
							
							
								 
						
							
								ee284ec587 
								
							 
						 
						
							
							
								
								Set version to 3.0.3.dev0  
							
							... 
							
							
							
							Also, using "dev0" as development suffix otherwise distutils gives a warning during "setup.py develop":
UserWarning: Normalizing '3.0.3.dev' to '3.0.3.dev0'
  normalized_version, 
							
						 
						
							2016-09-01 21:34:54 -03:00  
				
					
						
							
							
								 
						
							
								4c45b93007 
								
							 
						 
						
							
							
								
								Changes for 3.0.2 release  
							
							
							
						 
						
							2016-08-31 20:28:38 -04:00  
				
					
						
							
							
								 
						
							
								ea0febad28 
								
							 
						 
						
							
							
								
								Updates for new patch version 3.0.2  
							
							
							
						 
						
							2016-08-23 21:33:57 -03:00  
				
					
						
							
							
								 
						
							
								49fc4e5e4c 
								
							 
						 
						
							
							
								
								Changes for 3.0.1 release  
							
							
							
						 
						
							2016-08-23 18:15:43 -04:00  
				
					
						
							
							
								 
						
							
								db922403cc 
								
							 
						 
						
							
							
								
								Bump version to 3.1.0.dev  
							
							
							
						 
						
							2016-08-19 17:44:07 -03:00  
				
					
						
							
							
								 
						
							
								3a200b75c9 
								
							 
						 
						
							
							
								
								Bump version to 3.0.1.dev  
							
							
							
						 
						
							2016-08-19 17:41:45 -03:00  
				
					
						
							
							
								 
						
							
								a3e6c14da3 
								
							 
						 
						
							
							
								
								Bump version to 3.0.0  
							
							
							
						 
						
							2016-08-18 11:41:10 -04:00  
				
					
						
							
							
								 
						
							
								eaf8d9ce19 
								
							 
						 
						
							
							
								
								Set version to 3.0.0.dev1  
							
							... 
							
							
							
							For a long time now we've considering the next version to be 3.0.0 
							
						 
						
							2016-07-28 21:30:16 -03:00  
				
					
						
							
							
								 
						
							
								083f64100d 
								
							 
						 
						
							
							
								
								merge master into features  
							
							
							
						 
						
							2016-06-22 14:39:33 +02:00  
				
					
						
							
							
								 
						
							
								fad6266a47 
								
							 
						 
						
							
							
								
								finish up the version bump in __init__ i forgot  
							
							
							
						 
						
							2016-06-01 08:18:10 +02:00  
				
					
						
							
							
								 
						
							
								85541113eb 
								
							 
						 
						
							
							
								
								update version  
							
							
							
						 
						
							2016-05-31 19:05:36 +02:00  
				
					
						
							
							
								 
						
							
								5fcce8a7d6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							
							
						 
						
							2016-03-18 18:26:56 -03:00  
				
					
						
							
							
								 
						
							
								a70e92777f 
								
							 
						 
						
							
							
								
								Bump version to 2.9.2.dev1  
							
							
							
						 
						
							2016-03-18 18:24:24 -03:00  
				
					
						
							
							
								 
						
							
								9bdf51fcc5 
								
							 
						 
						
							
							
								
								Bump version to 2.9.1  
							
							
							
						 
						
							2016-03-17 17:03:46 -04:00  
				
					
						
							
							
								 
						
							
								c8c5a416ef 
								
							 
						 
						
							
							
								
								Bump version to 2.10.0.dev1  
							
							
							
						 
						
							2016-03-01 18:48:13 -03:00  
				
					
						
							
							
								 
						
							
								81af1c024a 
								
							 
						 
						
							
							
								
								Bump version to 2.9.1.dev1  
							
							
							
						 
						
							2016-03-01 18:46:17 -03:00  
				
					
						
							
							
								 
						
							
								623e786524 
								
							 
						 
						
							
							
								
								Bump version to 2.9.0  
							
							
							
						 
						
							2016-02-29 15:39:00 -05:00  
				
					
						
							
							
								 
						
							
								97f7815feb 
								
							 
						 
						
							
							
								
								also change pytest version to target 2.9.0  
							
							
							
						 
						
							2015-09-22 11:01:33 +02:00  
				
					
						
							
							
								 
						
							
								f02d9425f9 
								
							 
						 
						
							
							
								
								Bump version to 2.8.0  
							
							
							
						 
						
							2015-09-18 19:04:20 -03:00  
				
					
						
							
							
								 
						
							
								baf5b5d005 
								
							 
						 
						
							
							
								
								update changelog/author info, bump version number  
							
							
							
						 
						
							2015-09-17 13:43:39 +02:00  
				
					
						
							
							
								 
						
							
								7eb1211192 
								
							 
						 
						
							
							
								
								revert setuptools_scm addition introduced with  f22d14b105 
							
							
							
						 
						
							2015-09-17 12:58:04 +02:00  
				
					
						
							
							
								 
						
							
								6192e74f03 
								
							 
						 
						
							
							
								
								remove __init__.py as advised by ronny  
							
							
							
						 
						
							2015-09-17 10:51:03 +02:00  
				
					
						
							
							
								 
						
							
								a62d12634c 
								
							 
						 
						
							
							
								
								revert importing test module behaviour to prepend by default  
							
							
							
						 
						
							2015-09-16 22:12:20 +02:00  
				
					
						
							
							
								 
						
							
								fdd23878ec 
								
							 
						 
						
							
							
								
								Merge latest changes from branch 'pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	_pytest/__init__.py
	doc/en/fixture.rst
	setup.cfg
	testing/test_runner.py 
							
						 
						
							2015-09-16 09:26:55 +02:00  
				
					
						
							
							
								 
						
							
								16720b96b4 
								
							 
						 
						
							
							
								
								fix a few issues with pytest-2.7 branch and bump version number  
							
							... 
							
							
							
							- importorskip: skip a test if we have a minversion but cannot parse
  version numbers due to pkg_resources not present
- make runner tests work with latest xdist 
							
						 
						
							2015-09-15 12:17:52 +02:00  
				
					
						
							
							
								 
						
							
								a060b8ff73 
								
							 
						 
						
							
							
								
								use setuptools_scm to determine the version  
							
							
							
						 
						
							2015-07-25 10:44:18 +02:00  
				
					
						
							
							
								 
						
							
								cdd25c9512 
								
							 
						 
						
							
							
								
								bump version to 2.7, depend on py-1.4.29  
							
							
							
						 
						
							2015-06-22 23:53:41 +02:00  
				
					
						
							
							
								 
						
							
								504b6b72a9 
								
							 
						 
						
							
							
								
								Set 2.7.1 version number  
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-05-19 01:50:32 +01:00  
				
					
						
							
							
								 
						
							
								d9a44098ce 
								
							 
						 
						
							
							
								
								use new pluggy api (now at 0.3.0) for adding hookcall monitoring  
							
							... 
							
							
							
							and reraise real keyboard interrupts during inline pytest runs
to allow for better stopping of the pytest tests.
--HG--
branch : plug30 
							
						 
						
							2015-05-07 11:02:55 +02:00  
				
					
						
							
							
								 
						
							
								bb8141e27c 
								
							 
						 
						
							
							
								
								- make sure sub pytest runs use the same basetemp  
							
							... 
							
							
							
							- depend on pluggy < 0.3
--HG--
branch : pluggy1 
							
						 
						
							2015-05-06 14:58:46 +02:00  
				
					
						
							
							
								 
						
							
								5c8e5acf9d 
								
							 
						 
						
							
							
								
								change test module importing behaviour to append to sys.path  
							
							... 
							
							
							
							instead of prepending.  This better allows to run test modules
against installated versions of a package even if the package
under test has the same import root.  In this example::
   testing/__init__.py
   testing/test_pkg_under_test.py
   pkg_under_test/
the tests will preferrably run against the installed version
of pkg_under_test whereas before they would always pick
up the local version.
--HG--
branch : prefer_installed 
							
						 
						
							2015-04-17 22:25:35 +02:00  
				
					
						
							
							
								 
						
							
								74019025b9 
								
							 
						 
						
							
							
								
								shift default to 2.8.0.dev  
							
							
							
						 
						
							2015-04-04 16:32:25 +02:00  
				
					
						
							
							
								 
						
							
								b55d66d0cf 
								
							 
						 
						
							
							
								
								- avoid setting of versions and targets in conf.py and Makefile  
							
							... 
							
							
							
							as discussed on pytest-dev
- "make help" now prints pytest specific information.
- add a "_getdoctarget.py" helper
- make ``setup.py`` read the version from ``_pytest/__init__.py``
--HG--
branch : release-checklist 
							
						 
						
							2015-04-02 10:38:25 +02:00  
				
					
						
							
							
								 
						
							
								e16983d265 
								
							 
						 
						
							
							
								
								bump versions to dev, including changing the doc-install target to "dev"  
							
							... 
							
							
							
							instead of "latest" 
							
						 
						
							2015-03-26 13:48:59 +01:00  
				
					
						
							
							
								 
						
							
								d2a8866bce 
								
							 
						 
						
							
							
								
								bump verrsion to python2.7, fix a too precise test for windows, regen docs  
							
							
							
						 
						
							2015-03-26 09:34:10 +01:00  
				
					
						
							
							
								 
						
							
								f2cdbe776e 
								
							 
						 
						
							
							
								
								bump version to 2.7 on default  
							
							
							
						 
						
							2014-10-26 10:52:04 +01:00  
				
					
						
							
							
								 
						
							
								49b7237581 
								
							 
						 
						
							
							
								
								bump version to 2.6.4.dev  
							
							
							
						 
						
							2014-09-24 16:27:34 +02:00  
				
					
						
							
							
								 
						
							
								2eef674615 
								
							 
						 
						
							
							
								
								regen and fix some docs (tox -e regen)  
							
							... 
							
							
							
							bump versions, depend on already released py-1.4.25 
							
						 
						
							2014-09-24 14:46:56 +02:00  
				
					
						
							
							
								 
						
							
								b6dcfd4377 
								
							 
						 
						
							
							
								
								fix conftest related fixture visibility issue: when running with a  
							
							... 
							
							
							
							CWD outside a test package pytest would get fixture discovery wrong.
Thanks to Wolfgang Schnerring for figuring out a reproducable example.
--HG--
branch : conftest-nodeid 
							
						 
						
							2014-09-15 12:44:16 +02:00  
				
					
						
							
							
								 
						
							
								09a44f4cac 
								
							 
						 
						
							
							
								
								fix issue582: fix setuptools example, thanks Laszlo Papp and Ronny  
							
							... 
							
							
							
							Pfannschmidt. 
							
						 
						
							2014-09-05 15:34:01 +02:00  
				
					
						
							
							
								 
						
							
								7dad3cb157 
								
							 
						 
						
							
							
								
								prepare 2.6.2, release announcement, also add HOWTORELEASE.rst  
							
							
							
						 
						
							2014-09-05 13:13:23 +02:00  
				
					
						
							
							
								 
						
							
								e98f77037e 
								
							 
						 
						
							
							
								
								fix issue561 example adapted to python3.  
							
							
							
						 
						
							2014-08-08 15:20:37 +02:00  
				
					
						
							
							
								 
						
							
								e5eaf02e19 
								
							 
						 
						
							
							
								
								finalize pytest-2.6.1 release, regen docs  
							
							
							
						 
						
							2014-08-07 21:41:51 +02:00  
				
					
						
							
							
								 
						
							
								1d7b574b31 
								
							 
						 
						
							
							
								
								fix issue555: just add "errors" attribute to internal Capture stream.  
							
							
							
						 
						
							2014-08-07 11:05:42 +02:00