jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,975 Commits 2 Branches 0 Tags 34 MiB
Commit Graph

3975 Commits

Author SHA1 Message Date
Floris Bruynooghe 652a353319 Some small corrections to release process 
--HG--
branch : pytest-2.7
 2015-04-30 22:55:01 +01:00
Floris Bruynooghe d6d8d5b9d1 Prepare docs for bugfix release 
--HG--
branch : pytest-2.7
 2015-04-30 22:54:43 +01:00
Floris Bruynooghe 7f554f50e3 Fix collapse false to look at unescaped braces only 
Sometimes the repr of an object can contain the "\n{" sequence which is
used as a formatting language, so they are escaped to "\\n{".  But the
collapse-false code needs to look for the real "\n{" token instead of
simply "{" as otherwise it may get unbalanced braces from the object's
repr (sometimes caused by the collapsing of long reprs by saferepr).

Fixes issue #731.

--HG--
branch : pytest-2.7
 2015-04-30 02:31:12 +01:00
holger krekel e94f5727c4 Merged in contributing-fix (pull request #281) 
Remove duplicated step in CONTRIBUTING

--HG--
branch : pytest-2.7
 2015-04-26 01:05:50 +02:00
holger krekel 35da487d46 Close branch contributing-fix 
--HG--
branch : contributing-fix
 2015-04-26 01:05:50 +02:00
Bruno Oliveira a4ddec1157 Remove duplicated step in CONTRIBUTING 
--HG--
branch : contributing-fix
 2015-04-25 00:48:11 -03:00
holger krekel b4a655af52 Merged in nicoddemus/pytest/cx_freeze_ubuntu (pull request #280) 
Fix py27-cxfreeze tox environment

--HG--
branch : pytest-2.7
 2015-04-23 12:03:14 +02:00
Floris Bruynooghe 0cc9d7e6b6 Merged in hpk42/pytest-patches/reintroduce_pytest_fixture (pull request #279) 
reintroduced _pytest fixture of the pytester plugin

--HG--
branch : pytest-2.7
 2015-04-23 00:52:13 +01:00
Bruno Oliveira 6fe5493c3c Fix py27-cxfreeze tox environment 
Use a custom script to install a patched version of cx_freeze,
as required in Ubuntu 14.04 systems

--HG--
branch : cx_freeze_ubuntu
 2015-04-22 19:46:06 -03:00
holger krekel a3aebfaefe accomodate Floris' comments. (The reason was i just reinstanted the old code :) 
--HG--
branch : reintroduce_pytest_fixture
 2015-04-22 21:04:36 +02:00
holger krekel 9d5182eaad reintroduced _pytest fixture of the pytester plugin which is used 
at least by pytest-xdist.

--HG--
branch : reintroduce_pytest_fixture
 2015-04-22 17:06:00 +02:00
Floris Bruynooghe a6b5f583a7 Merged in hpk42/pytest-patches/nodrone (pull request #277) 
strike drone badge as it doesn't make sense on PYPI (where the README is rendered)

--HG--
branch : pytest-2.7
 2015-04-21 15:01:42 +01:00
holger krekel cfe9c9c169 strike drone badge as it doesn't make sense on PYPI (where the README is rendered) 
--HG--
branch : nodrone
 2015-04-21 15:55:48 +02:00
holger krekel 0b361c62c8 Merged in getsourcelines-error-issue-553-pytest2.7 (pull request #273) 
Handle inspect.getsourcelines failures in FixtureLookupError

--HG--
branch : pytest-2.7
 2015-04-17 22:31:55 +02:00
holger krekel 282f4ce920 Close branch getsourcelines-error-issue-553-pytest2.7 
--HG--
branch : getsourcelines-error-issue-553-pytest2.7
 2015-04-17 22:31:55 +02:00
Floris Bruynooghe 6e2bc7712c Merged in hpk42/pytest-patches/systemexit (pull request #274) 
fixed regression to 2.6.4 which surfaced e.g. in lost stdout capture printing

--HG--
branch : pytest-2.7
 2015-04-17 11:07:24 +01:00
holger krekel 173bd13ece backport Y->y fix from floris 
--HG--
branch : pytest-2.7
 2015-04-17 11:57:09 +02:00
holger krekel e04273df57 fixed regression to 2.6.4 which surfaced e.g. in lost stdout capture printing 
when tests raised SystemExit.

--HG--
branch : systemexit
 2015-04-17 11:47:29 +02:00
Bruno Oliveira 15328c04eb Handle inspect.getsourcelines failures in FixtureLookupError 
Fixes #553

--HG--
branch : getsourcelines-error-issue-553-pytest2.7
 2015-04-15 19:31:22 -03:00
Floris Bruynooghe 6591d7a209 Merged in issue660 (pull request #268) 
fix issue660

--HG--
branch : pytest-2.7
 2015-04-13 00:00:40 +01:00
Floris Bruynooghe 220d177e76 Close branch issue660 
--HG--
branch : issue660
 2015-04-13 00:00:40 +01:00
Floris Bruynooghe 9cae9a2a97 Add wheel support in the changelog 
--HG--
branch : pytest-2.7
 2015-04-12 23:36:43 +01:00
Floris Bruynooghe 129bb5393b Do imports at the head of the file 
--HG--
branch : pytest-2.7
 2015-04-12 23:36:28 +01:00
Ionel Cristian Maries db08dcab14 Rename function and add nice docstring. 
--HG--
branch : pytest-2.7
 2015-04-10 22:11:17 +03:00
Ionel Cristian Maries edd6c0f9b3 Make argpase a dependency for python 3.0 and 3.1 too. 
--HG--
branch : pytest-2.7
 2015-04-10 21:59:47 +03:00
Ionel Cristian Maries a58cb3b95c Test for setuptools 0.7.2, turns out there's no 0.7 release on pypi. 
--HG--
branch : pytest-2.7
 2015-04-10 21:58:59 +03:00
Ionel Cristian Maries 40a682476d Improve version test (use pkg_resources to compare versions). Also log failures to stderr. 
--HG--
branch : pytest-2.7
 2015-04-10 21:44:27 +03:00
Ionel Cristian Maries b7d43c5a5d Add support for building proper wheels (universal and proper dependency evnironment markers for argparse/colorama if setuptools is new-ish). 
--HG--
branch : pytest-2.7
 2015-04-10 21:08:50 +03:00
holger krekel 236cac86b1 add me as author of PR 
--HG--
branch : issue660
 2015-04-04 16:36:32 +02:00
holger krekel 79c0515945 merge pytest-2.7 branch 
--HG--
branch : issue660
 2015-04-04 16:35:14 +02:00
holger krekel 0e916460d8 add changelog entries 
--HG--
branch : pytest-2.7
 2015-04-04 16:29:38 +02:00
holger krekel 69a0eacb4f Close branch release-checklist 
--HG--
branch : release-checklist
 2015-04-04 16:27:07 +02:00
holger krekel 7f05cd8bfc more streamlining of release checklist 
--HG--
branch : release-checklist
 2015-04-02 10:55:24 +02:00
holger krekel 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
holger krekel 3ed3e51997 fix issue660: properly report fixture scope mismatches independent 
from fixture argument ordering.

--HG--
branch : issue660
 2015-04-01 18:42:48 +02:00
holger krekel 81d7883884 refine release process according to Bruno's feedback 
--HG--
branch : release-checklist
 2015-03-27 09:27:31 +01:00
holger krekel ad137d46a2 add a release checklist 
--HG--
branch : release-checklist
 2015-03-26 14:04:33 +01:00
holger krekel e16983d265 bump versions to dev, including changing the doc-install target to "dev" 
instead of "latest"
 2015-03-26 13:48:59 +01:00
holger krekel fd6ff9bc01 Added tag 2.7.0 for changeset 7ed701fa2fb5 2015-03-26 13:44:58 +01:00
holger krekel d2a8866bce bump verrsion to python2.7, fix a too precise test for windows, regen docs 2015-03-26 09:34:10 +01:00
Anatoly Bubenkov c69978fbb0 revert verbosity 2015-03-24 13:41:49 +01:00
Anatoly Bubenkov c1eaa72883 correct config 2015-03-24 11:56:59 +01:00
Anatoly Bubenkov 55f3ffd2ba add verbosity to the tests 2015-03-24 10:51:45 +00:00
Anatoly Bubenkov 55eb82c434 fix pep257 2015-03-23 21:28:29 +01:00
Anatoly Bubenkov d94a29e866 merge almarklein/default 2015-03-23 21:25:10 +01:00
Anatoly Bubenkov a7d2a82caa merge pfctdayelise/issue463 2015-03-23 20:42:16 +01:00
Anatoly Bubenkov ce95437dee merge with default 
--HG--
branch : issue463
 2015-03-23 20:41:27 +01:00
Brianna Laugher 3ba3112a85 update changelog 
--HG--
branch : issue463
 2015-03-23 20:28:04 +01:00
Brianna Laugher c019e489d2 Change docstring style 
--HG--
branch : issue463
 2015-03-23 20:27:53 +01:00
Brianna Laugher 43e4fcf6dd Raise specific MarkerError rather than generic ValueError 
--HG--
branch : issue463
 2015-03-23 20:01:58 +01:00