31af381c56
Merged in hpk42/pytest-patches/prefer_installed (pull request #275 )
...
change test module importing behaviour to append to sys.path
2015-04-21 10:47:33 +01:00
bac1ccd5b3
merge fix of issue553 on pytest-2.7
2015-04-17 22:32:49 +02:00
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
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
fb07a09964
Merge pull request #274 from pytest-2.7
...
fixed regression to 2.6.4 which surfaced e.g. in lost stdout capture printing
2015-04-17 11:10:47 +01:00
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
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
09dff73607
Merge pytest-2.7 for issue660 fix
2015-04-13 00:04:53 +01:00
6591d7a209
Merged in issue660 (pull request #268 )
...
fix issue660
--HG--
branch : pytest-2.7
2015-04-13 00:00:40 +01:00
ddffa9d1cc
Merge wheel support from pytest-2.7 branch
...
Merged in pytest-2.7 (pull request #269 ).
2015-04-12 23:47:10 +01:00
9cae9a2a97
Add wheel support in the changelog
...
--HG--
branch : pytest-2.7
2015-04-12 23:36:43 +01:00
236cac86b1
add me as author of PR
...
--HG--
branch : issue660
2015-04-04 16:36:32 +02:00
79c0515945
merge pytest-2.7 branch
...
--HG--
branch : issue660
2015-04-04 16:35:14 +02:00
74019025b9
shift default to 2.8.0.dev
2015-04-04 16:32:25 +02:00
0e916460d8
add changelog entries
...
--HG--
branch : pytest-2.7
2015-04-04 16:29:38 +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
3ed3e51997
fix issue660: properly report fixture scope mismatches independent
...
from fixture argument ordering.
--HG--
branch : issue660
2015-04-01 18:42:48 +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
d94a29e866
merge almarklein/default
2015-03-23 21:25:10 +01:00
ce95437dee
merge with default
...
--HG--
branch : issue463
2015-03-23 20:41:27 +01:00
3ba3112a85
update changelog
...
--HG--
branch : issue463
2015-03-23 20:28:04 +01:00
f3580bee2d
fix issue435: make reload() work when assert rewriting is active.
...
Thanks Daniel Hahler.
2015-03-23 10:08:47 +01:00
0fc75c9622
Storing sys.last_traceback: test, docs and changelog
2015-03-21 17:06:24 +01:00
060609317a
allow to override parametrized fixtures with non-parametrized ones and vice versa
...
--HG--
branch : parametrized-fixture-override
2015-03-01 13:54:43 +01:00
1e6e373913
Merged in issue616 (pull request #252 )
...
fix issue616 - conftest visibility fixes.
2015-02-28 10:02:58 +01:00
019dc14fc4
fix typos, clarify git/hg
...
--HG--
branch : docs_community
2015-02-27 13:38:45 +01:00
f6df3b0b97
added documentationo on the new pytest-dev teams on bitbucket and
...
github. See https://pytest.org/latest/contributing.html (tentative)
Thanks to Anatoly for pushing and initial work on this.
--HG--
branch : docs_community
2015-02-27 11:54:17 +01:00
8ed5b77aba
fix issue650: introduce new --doctest-ignore-import-errors option courtesy
...
of Charles Cloud.
2015-02-26 22:02:49 +01:00
d73e689991
fix issue616 - conftest visibility fixes. This is achieved by
...
refactoring how nodeid's are constructed. They now are always
relative to the "common rootdir" of a test run which is determined by
finding a common ancestor of all testrun arguments.
--HG--
branch : issue616
2015-02-26 21:56:44 +01:00
3d0b756877
merge in the 2.6 maintenance branch
2015-02-22 11:45:07 +01:00
d1adbf4a5c
Added documentation for PYTEST_ADDOPTS environment variable, updated CHANGELOG and AUTHORS.
...
--HG--
branch : env-addopts
2015-02-09 14:11:54 +00:00
5941b2e071
fix issue 655: crude workarounds around python2/3 exception leaks
2015-01-09 19:55:49 +01:00
e4bb48995a
Mention fix for issue 615 in changelog
...
Fixes issue 615.
2014-10-28 13:31:09 +00:00
d0d4759c96
fix changelog -- we should have all changes in trunk that are in 2.6.4
2014-10-24 17:19:54 +02:00
60cdb875ed
backport pastebin fix
...
--HG--
branch : pytest-2.6
2014-10-24 15:24:44 +02:00
0834b63560
backport fixed issue620 (doc for genscript)
...
--HG--
branch : pytest-2.6
2014-10-24 13:53:39 +02:00
5f2444d2a2
Merged in nicoddemus/pytest/fix-pastebin (pull request #228 )
...
Fix --pastebin option
2014-10-23 09:08:30 +02:00
537dca477b
Fixing --pastebin option by using a POST request instead of a XMLRPC call
...
fixes #614
--HG--
branch : fix-pastebin
2014-10-22 21:52:40 -02:00
c63dc62294
Mention issue351/PR161 in changelog
2014-10-22 23:20:27 +01:00
16f0d100cc
added changelog entry about glob-patterns in python_classes and python_functions
...
- also fixed small typo
--HG--
branch : python-classes-glob
2014-10-21 19:22:53 -02:00
8dfd6c17e3
add changelog note for tom's PR about parametrized markers.
2014-10-14 10:12:45 +02:00
857db415bc
fix some spelling mistakes
...
--HG--
branch : some_spelling_fixes
2014-10-13 23:16:26 +01:00
b7dd8eac8e
remove unused import
2014-10-09 22:45:33 +02:00
8b9bb5ff54
fix changelog
2014-10-09 17:06:39 +02:00
cea9367739
Merged in HolgerPeters/pytest (pull request #221 )
...
Make doctest flags configurable
2014-10-09 17:05:48 +02:00
c85c5d05c5
add changelog entry for new hookwrapper mechanism
2014-10-09 12:29:57 +02:00
61caa4f776
Add documentation for doctest flags and remove dead code
2014-10-08 15:48:41 +02:00
1ed1ef3c71
open up pytest-2.6 branch in case we want to release a 2.6.4 before 2.7.0 happens
...
--HG--
branch : pytest-2.6
2014-10-07 11:14:57 +02:00
a298077461
merge with default
2014-10-07 01:06:15 +02:00
Floris Bruynooghe
holger krekel
Bruno Oliveira
Anatoly Bubenkov
Brianna Laugher
Almar Klein
Ronny Pfannschmidt
Dave Hunt
TomV
Holger Peters