17f64704c2
Merge remote-tracking branch 'upstream/features'
2017-05-23 14:20:12 -03:00
f9953fbe7c
Merge pull request #2425 from nicoddemus/publish-task
...
Create task for publishing a release
2017-05-23 10:46:48 +02:00
0ea80eb63c
Merge pull request #2428 from The-Compiler/param-id-docs
...
Add docs for id= with pytest.param
2017-05-23 10:30:54 +02:00
38ebf8dd10
Merge pull request #2429 from The-Compiler/regenschauer
...
Make --cache-show output deterministic
2017-05-23 10:30:39 +02:00
04b1583d10
Merge pull request #2426 from The-Compiler/fix-changelog
...
Fix up 3.1 changelog
2017-05-23 08:18:24 +02:00
d9b93674c3
Make --cache-show output deterministic
...
This makes sure things don't jump around in the regenerated docs.
2017-05-23 08:01:39 +02:00
7d6bde2496
Add docs for id= with pytest.param
2017-05-23 07:57:34 +02:00
bd065a12bb
Fix up 3.1 changelog
2017-05-23 07:40:39 +02:00
f9df750025
Update 3.1.0 release date
2017-05-22 19:39:17 -03:00
d343f9497c
Merge branch 'release-3.1'
2017-05-22 19:10:06 -03:00
5192191c38
Create task for publishing a release
2017-05-22 19:06:53 -03:00
69343310c6
Merge pull request #2422 from pytest-dev/refactor-config
...
Refactor config
2017-05-20 10:00:12 -03:00
c9c2c34b44
Remove unused parameter
2017-05-20 04:39:45 -04:00
9beeef970e
Parse the filename in the generator expression
2017-05-20 04:38:30 -04:00
43aa037ebd
Reindent
2017-05-20 04:38:30 -04:00
2abf2070f2
Collapse nested for loops into a generator expression
2017-05-20 04:38:30 -04:00
ce0ff0040f
Reindent and add docstring
2017-05-20 04:38:27 -04:00
6d2e11b7d1
Extract method for _mark_plugins_for_rewrite
2017-05-20 04:18:41 -04:00
9b48613baa
Preparing release version 3.1.0
2017-05-19 18:12:59 -04:00
0ff7f5d0c6
Prepare CHANGELOG for version 3.1.0
2017-05-19 19:10:09 -03:00
36cf89a2de
Merge remote-tracking branch 'upstream/master' into features
2017-05-19 18:01:56 -04:00
3a4d37248d
Merge pull request #2414 from nicoddemus/revert-new-style-classes
...
Revert refactor of old-style to new-style classes
2017-05-19 18:58:46 -03:00
637550b249
Merge pull request #2418 from axil/master
...
small fix in an example from the docs
2017-05-18 12:24:52 -03:00
598aefc686
small fix in an example from the docs
2017-05-18 21:18:09 +07:00
7af0e6bda1
Merge pull request #2415 from flub/training
...
Remove past training
2017-05-17 20:57:50 -03:00
f7247dc99d
Remove past training
...
Leaving the sidebar as an example for in the future.
2017-05-17 22:47:51 +01:00
d86c89e193
Revert refactor of old-style to new-style classes
...
As discussed in the mailing list, unfortunately this might break APIs
due to the subtle differences between new and old-style classes (see #2398 ).
This reverts commit d4afa1554b#2179 .
2017-05-17 18:20:51 -03:00
e484f4760f
Merge pull request #2412 from pytest-dev/pytest-book-ref
...
Add a reference to Python testing book to talks docs
2017-05-17 22:52:13 +02:00
70bcd1fb7b
Add a reference to Python testing book to talks docs
2017-05-17 17:17:19 -03:00
6f407ef308
Merge pull request #2411 from nicoddemus/automate-pre-release
...
Automate pre release steps
2017-05-17 14:36:33 +02:00
feab3ba70f
Implement tasks to improve release automation
2017-05-15 23:44:03 -03:00
00e7ee532e
Fix minor regendoc issues
2017-05-15 21:57:04 -03:00
fe49c78f32
Merge remote-tracking branch 'upstream/master' into release-3.1
2017-05-15 21:56:44 -03:00
3c41349fe1
Merge pull request #2406 from RonnyPfannschmidt/regendoc-reduce-version-noise
...
regendoc: reduce version noise by replacing minor/patch with placeholders
2017-05-15 19:40:45 -03:00
bd708068ab
Merge branch 'features' into regendoc-reduce-version-noise
2017-05-14 14:34:07 -03:00
783670b84e
Merge pull request #2274 from dmand/feat/junitxml/suite-name-option
...
Add `junit_suite_name` ini option
2017-05-13 19:10:29 +02:00
03753ca201
intermediate state after attempt with the plain env, DONT MERGE
2017-05-13 13:25:52 +02:00
456925b604
Merge pull request #2395 from RonnyPfannschmidt/consider-all-modules
...
Consider all modules
2017-05-12 18:25:12 -03:00
f39f416c5d
Improve tests a bit
...
Use a normal function instead of a lambda
Parametrize test about suite name option
2017-05-12 17:52:50 -03:00
d1e44d16e7
regenerate docs from the pytest env
2017-05-12 22:51:20 +02:00
2ab8d12fe3
Update changelog and add usage info
2017-05-12 17:48:50 -03:00
c9282f9e94
Transition to using ini option for suite name
2017-05-12 17:48:50 -03:00
bcfa6264f1
Update AUTHORS list
2017-05-12 17:48:50 -03:00
204db4d1e2
Update Changelog
2017-05-12 17:48:50 -03:00
fe7d89f033
Add '--junit-suite-name' CLI option
2017-05-12 17:48:50 -03:00
c765fa6d04
add regendoc normaliz for pytest --version
2017-05-12 22:38:50 +02:00
f1c4e2c032
regendoc: reduce version noise by replacing minor/patch with placeholders
2017-05-12 22:17:40 +02:00
a92e397011
add changelog for fixing #2391
2017-05-12 18:39:45 +02:00
b6125d9a13
Merge pull request #2397 from nicoddemus/announce-task
...
Introduce a task to generate the announcement file for releases
2017-05-11 15:12:12 +02:00
66ba3c3aa4
Introduce a task to generate the announcement file for releases
2017-05-09 23:50:08 -03:00
Bruno Oliveira
Ronny Pfannschmidt
Florian Bruhin
Jason R. Coombs
Lev Maximov
Floris Bruynooghe
Florian Bruhin
Ronny Pfannschmidt
Dmitri Pribysh