Florian Bruhin
1e60294188
Merge pull request #1679 from eli-b/patch-1
...
catched -> caught
2016-06-27 18:02:16 +02:00
Ronny Pfannschmidt
e877e25587
drop python 3.0-3.2 support code from setup.py
...
addresses #1627
2016-06-27 17:55:37 +02:00
Eli Boyarski
21d27784eb
catched -> caught
...
Even though catch is a Python keyword, 'catched' just looks terrible in text.
If the text was supposed to reference the keyword, then 'catched' should be changed to "'catch'ed".
2016-06-27 15:41:40 +03:00
Bruno Oliveira
ccd395ffe0
Merge pull request #1659 from RonnyPfannschmidt/failtest-586
...
xfailing test for #568
2016-06-27 07:38:14 -03:00
Ronny Pfannschmidt
76756c0c0b
mark tests: use better name of the test for #568
2016-06-27 11:57:21 +02:00
Bruno Oliveira
44695ae46c
Fix CHANGELOG: obestwalter appearing twice due to mergig separate PRs
2016-06-26 23:44:07 +02:00
Bruno Oliveira
7e78965c79
Merge branch 'logic_brackets'
2016-06-26 21:34:37 +02:00
Bruno Oliveira
58e558141d
Remove commented out code
2016-06-26 21:19:07 +02:00
Bruno Oliveira
22c2d87633
Fix bad merge in CHANGELOG
2016-06-26 21:18:01 +02:00
Bruno Oliveira
5891061ac1
Merge pull request #1675 from kvas-it/issue-1562
...
Add warning for assertions on tuples #1562
2016-06-26 16:09:15 -03:00
Bruno Oliveira
48ac1a0986
Merge branch 'remove-old-entry-points' into features
2016-06-26 20:38:59 +02:00
Bruno Oliveira
db9b3e9522
Merge pull request #1677 from nicoddemus/remove_cmd_options
...
Remove cmd options
2016-06-26 15:37:59 -03:00
Bruno Oliveira
b9536608c5
Add issue and obestwalter to CHANGELOG
...
Fix #1632
2016-06-26 20:36:04 +02:00
Bruno Oliveira
f7a2048e96
Merge branch 'features' of https://github.com/Avira/pytest into remove-old-entry-points
2016-06-26 20:32:38 +02:00
Bruno Oliveira
7239f36466
Improve formatting in CHANGELOG
2016-06-26 19:41:01 +02:00
RedBeardCode
1b0dbd8c40
Move the freezing function from genscript.py to a new module freeze_support.py
2016-06-26 19:37:24 +02:00
RedBeardCode
0e2ebc96ff
Remove deprecated cmd options
...
Fixes #1657
2016-06-26 19:26:04 +02:00
aostr
b4e0fabf93
* added missing link to the referenced issue
2016-06-26 06:52:50 +02:00
aostr
1ce4670062
* removed tailing whitespaces
2016-06-26 06:51:57 +02:00
Vasily Kuznetsov
6d4cee2159
Add a test for indirect use of tuple in the assert that should not cause a warning
2016-06-26 02:21:51 +02:00
Vasily Kuznetsov
0db4ae15a9
Update changelog
2016-06-25 19:34:55 +02:00
Vasily Kuznetsov
c17027e576
Warn about asserts on tuples ( fixes #1562 )
2016-06-25 19:21:48 +02:00
aostr
e04d9ff80b
* now showing pytest warnings summary by default.
...
* added ``--disable-pytest-warnings` flag to let users disable the warnings summary.
* extended/changed unit tests for the changes in the pytest core.
2016-06-25 18:16:13 +02:00
RedBeardCode
e2f550156e
Improve of the test output for logical expression with brackets.
...
Fixes #925
2016-06-25 18:10:36 +02:00
holger krekel
68bed00d5b
Merge pull request #1667 from fengxx/feature/override_ini_option
...
Add --overwrite-ini ININAME=INIVALUE cli option
2016-06-25 18:10:10 +02:00
Ted Xiao
856e6cab75
add --override-ini option to overrides ini values
...
Signed-off-by: Ted Xiao <xiao.xj@gmail.com>
2016-06-25 23:45:32 +08:00
holger krekel
13a188fe37
Merge pull request #1647 from sallner/features
...
Add new options to report fixture setup and teardown
2016-06-25 16:38:37 +02:00
Oliver Bestwalter
3a9e9fdf82
rephrase changes in CHANGELOG.rst
2016-06-25 16:04:23 +02:00
Oliver Bestwalter
72450408ed
add changes in CHANGELOG.rst
2016-06-25 16:00:49 +02:00
Ronny Pfannschmidt
95b83958f4
add xfailing test for issue #568
2016-06-25 15:49:23 +02:00
Ronny Pfannschmidt
2af3a7a9d7
Merge pull request #1519 from omarkohl/pytest_skip_decorator
...
Raise CollectError if pytest.skip() is called during collection
2016-06-25 15:20:34 +02:00
Florian Bruhin
35cd12e4de
Merge pull request #1660 from hackebrot/parametrize-with-fixtures
...
Proposal: Parametrize with fixtures
2016-06-25 15:05:27 +02:00
Raphael Pierzina
1b6bc4d606
Add feature proposal to changelog
2016-06-25 14:58:18 +02:00
Bruno Oliveira
c519b9517a
Merge pull request #1663 from aostr/master
...
Rename the default plugin "pdb" into "debugging"
2016-06-25 09:56:54 -03:00
Raphael Pierzina
eb98a8eefb
Change version in issues section to pytest 3.0 only
2016-06-25 14:52:57 +02:00
Raphael Pierzina
acfdd85dff
Move document to proposals subfolder
2016-06-25 14:42:19 +02:00
Bruno Oliveira
e0242146ec
Merge pull request #1666 from pytest-dev/1564-changelog
...
Add changelog entry for #1564
2016-06-25 09:34:21 -03:00
Bruno Oliveira
df17f862fa
Merge pull request #1648 from blueyed/simplify-Argument-__repr__
...
Simplify Argument.__repr__
2016-06-25 09:26:50 -03:00
Bruno Oliveira
7eb1318db2
Merge pull request #1656 from pytest-dev/rm-indiegogo-links
...
Update website wrt indiegogo campaign
2016-06-25 09:22:07 -03:00
Florian Bruhin
ce603dc0ea
Add changelog entry for #1564
2016-06-25 14:18:41 +02:00
Ronny Pfannschmidt
70ea3ce7f7
Merge pull request #1564 from The-Compiler/issue1479
...
Don't ignore ImportError when importing setuptools plugins
2016-06-25 14:09:48 +02:00
aostr
9a5224e2f8
Renamed the pdb module and changed unit tests accordingly
2016-06-25 12:37:31 +02:00
Danielle Jenkins
32ca5cdb09
Update changelog for new fixture hooks.
2016-06-25 12:33:31 +02:00
Oliver Bestwalter
891e1677b6
Remove all py.test-X* entry points.
...
The versioned, suffixed entry points are not documented and a leftover from a pre-virtualenv world. They also are broken for wheels.
2016-06-25 12:27:05 +02:00
Danielle Jenkins
9877bf47e3
Improve commenting for setupplan unittest.
2016-06-25 12:21:31 +02:00
Danielle Jenkins
7a3daac85b
Add docs for setuponly and setupplan options.
2016-06-25 12:21:12 +02:00
Danielle Jenkins
da5c579d82
Move setupplan and setuponly options to their respective modules.
...
Also, changed their group from "general" to "debugconfig".
2016-06-25 12:20:56 +02:00
Danielle Jenkins
032ce8baf6
Switch setuponly and setupplan options to a hook-based implementation.
2016-06-25 12:19:46 +02:00
aostr
05b5554cac
Renamed pytest pdb to debugging which conflicts with python pdb.
...
Combining multiple imports the "import pdb" imports the pytest module
as opposed to the python debugger.
2016-06-25 12:09:05 +02:00
Raphael Pierzina
5860c609ae
Remove note on scoping
2016-06-25 11:09:46 +02:00