fb4da00a32
Merge remote-tracking branch 'upstream/features' into invocation-scoped-fixtures
2016-07-11 20:09:13 -03:00
6f68dfcc47
Merge pull request #1710 from RonnyPfannschmidt/fixture-split
...
Fixture split 2nd attempt
2016-07-10 12:10:07 -03:00
8ed055efd8
Add acceptance test for invocation-scoped fixtures
2016-07-09 22:52:07 -03:00
775100881a
Implement invocation-scoped fixtures
2016-07-09 22:52:05 -03:00
29289b472f
Add documentation for "invocation" scoped fixture
2016-07-09 16:51:25 -03:00
8c49561470
split most fixture related code into own plugin
2016-07-09 20:36:00 +02:00
7a2058e3db
Merge pull request #1709 from The-Compiler/changelog
...
Clean up changelog
2016-07-08 18:52:28 +02:00
668ebb102c
Clean up changelog
...
- Merged 3.0 and 2.10 as much stuff from the sprint went to the 2.10
section.
- Cleaned up mixture of link/text blocks
- Moved some entries to "Bug Fixes" and "Incompatible changes"
- Stop doing "Fixes (#123 ) ..." because it looks weird
- Add some new empty points for all sections
2016-07-08 18:51:26 +02:00
293351cfd0
Merge pull request #1705 from RonnyPfannschmidt/merge-master
...
Merge from master to features
2016-07-08 08:15:54 -03:00
dad6aa8a16
fix duplicate target in changelog
2016-07-06 13:51:13 +02:00
b9a91dc112
merge from master to features
2016-07-06 11:51:48 +02:00
f31c31a73c
Merge pull request #1695 from sallner/feature-setup-show
...
Feature setup show
2016-07-05 21:29:01 -03:00
cc0920ceb1
Merge pull request #1699 from nicoddemus/404-links-on-talks-docs
...
Fix links and removed 404 links from talks.rst
2016-07-05 08:44:23 +02:00
067e044f97
Merge pull request #1700 from nicoddemus/split-appveyor
...
Split AppVeyor test runs in multiple jobs to avoid timeout issues
2016-07-05 06:43:39 +02:00
10c5e6fd9c
Split AppVeyor test runs in multiple jobs to avoid timeout issues
...
Some of our builds have been timing out (over 1 hour),
on AppVeyor
2016-07-04 21:54:21 -03:00
8d39ce17da
Fix links and removed 404 links from talks.rst
...
Fix #1696
2016-07-04 21:32:57 -03:00
6438895a23
Fix PEP-8.
2016-07-03 22:33:21 +02:00
b650c3c118
Implement --setup-show cli flag
...
to also be able to see fixture setup with normal test execution.
2016-07-03 22:30:51 +02:00
f7b5bb2f97
Merged branch features into features
2016-07-03 21:07:02 +02:00
f74dd8550f
Merge pull request #1692 from pytest-dev/changelog
...
Add changelog to requirements for pytest-dev plugins
2016-06-30 17:39:14 -03:00
e3c43a1462
Add changelog to requirements for pytest-dev plugins
...
Closes #1691
2016-06-30 22:25:09 +02:00
7927dff8a1
Merge pull request #1678 from RonnyPfannschmidt/drop-python30-32
...
drop python 3.0-3.2 support code from setup.py
2016-06-30 11:15:49 +02:00
1451a1ab00
remove unsupported python versions from code/source xfail
2016-06-30 10:03:40 +02:00
75ecd94294
Merge pull request #1689 from quodlibetor/autouse-docs
...
Document the interaction of autouse scopes
2016-06-29 18:08:06 -03:00
771c4539fa
Document the interaction of autouse scopes
...
I wouldn't have even attempted what I did to cause #1688 if this had
been there.
2016-06-29 16:52:13 -04:00
2a43237527
docs: no longer include python 3.0-3.2 in the index page
2016-06-27 18:20:56 +02:00
7dc8d1ab60
fix typo and remove python3.2 from readme
2016-06-27 18:19:00 +02:00
1e60294188
Merge pull request #1679 from eli-b/patch-1
...
catched -> caught
2016-06-27 18:02:16 +02:00
e877e25587
drop python 3.0-3.2 support code from setup.py
...
addresses #1627
2016-06-27 17:55:37 +02:00
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
ccd395ffe0
Merge pull request #1659 from RonnyPfannschmidt/failtest-586
...
xfailing test for #568
2016-06-27 07:38:14 -03:00
76756c0c0b
mark tests: use better name of the test for #568
2016-06-27 11:57:21 +02:00
44695ae46c
Fix CHANGELOG: obestwalter appearing twice due to mergig separate PRs
2016-06-26 23:44:07 +02:00
7e78965c79
Merge branch 'logic_brackets'
2016-06-26 21:34:37 +02:00
58e558141d
Remove commented out code
2016-06-26 21:19:07 +02:00
22c2d87633
Fix bad merge in CHANGELOG
2016-06-26 21:18:01 +02:00
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
48ac1a0986
Merge branch 'remove-old-entry-points' into features
2016-06-26 20:38:59 +02:00
db9b3e9522
Merge pull request #1677 from nicoddemus/remove_cmd_options
...
Remove cmd options
2016-06-26 15:37:59 -03:00
b9536608c5
Add issue and obestwalter to CHANGELOG
...
Fix #1632
2016-06-26 20:36:04 +02:00
f7a2048e96
Merge branch 'features' of https://github.com/Avira/pytest into remove-old-entry-points
2016-06-26 20:32:38 +02:00
7239f36466
Improve formatting in CHANGELOG
2016-06-26 19:41:01 +02:00
1b0dbd8c40
Move the freezing function from genscript.py to a new module freeze_support.py
2016-06-26 19:37:24 +02:00
0e2ebc96ff
Remove deprecated cmd options
...
Fixes #1657
2016-06-26 19:26:04 +02:00
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
0db4ae15a9
Update changelog
2016-06-25 19:34:55 +02:00
c17027e576
Warn about asserts on tuples ( fixes #1562 )
2016-06-25 19:21:48 +02:00
e2f550156e
Improve of the test output for logical expression with brackets.
...
Fixes #925
2016-06-25 18:10:36 +02:00
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
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
Bruno Oliveira
Ronny Pfannschmidt
Florian Bruhin
Florian Bruhin
Ronny Pfannschmidt
Steffen Allner
Brandon W Maister
Eli Boyarski
RedBeardCode
Vasily Kuznetsov
holger krekel
Ted Xiao