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
7ee2db23df
Merge pull request #2396 from johndgiese/patch-1
...
Clarify opening paragraph of parameterization docs
2017-05-09 21:36:50 +02:00
52c67af63c
Clarify opening paragraph of parameterization docs
...
- Fix a few small grammar mistakes
- Rewrite a few sentences to make them shorter and easier to read
2017-05-09 10:02:08 -04:00
8bcf88ec12
try to consider all modules after registration as plugin
2017-05-05 11:16:05 +02:00
daca618012
Merge pull request #2389 from nicoddemus/merge-master-into-features
...
Merge master into features
2017-05-04 10:33:00 +02:00
f3b359f5b8
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
...
# Conflicts:
# _pytest/capture.py
# _pytest/compat.py
# _pytest/python.py
# testing/python/collect.py
# testing/test_mark.py
2017-05-03 19:04:53 -03:00
3fc917a261
Merge pull request #2385 from nicoddemus/anaconda-badge
...
Add badge for anaconda package version
2017-05-03 07:07:52 +02:00
814ea9d62c
Merge pull request #2387 from nicoddemus/trial-errors
...
Fix py35-trial environment
2017-05-03 06:52:12 +02:00
630cca2fba
Fix py35-trial environment
...
After updating to twisted 17.1.0, again the trial tests started to fail; didn't investigate too deep, decided to just
no longer delete "zope" modules when cleaning up after pytester because it seems more zope modules keep
global state that shouldn't be discarded
2017-05-02 21:05:42 -03:00
bfd2563b3a
Merge pull request #2386 from robin0371/show-correct-msg
...
Issue #2383 - AssertionError with wrong number of parametrize arguments
2017-04-29 14:57:01 +02:00
60b8339166
Issue #2383 - Show the correct error message when collect "parametrize" func with wrong args and add test for this case.
2017-04-29 14:32:09 +03:00
34f488757f
Add badge for anaconda package version
2017-04-28 12:51:40 -03:00
cccb2cc92b
Merge pull request #1834 from RonnyPfannschmidt/setuptools-scm-take-2
...
second take at setuptools_scm
2017-04-27 09:10:23 -03:00
d7d2249d99
Merge pull request #2378 from szuliq/patch-1
...
Update docs
2017-04-26 20:55:52 -03:00
a280e43949
fix import error
2017-04-26 15:57:55 +02:00
f0533194ed
Update fixture.rst
...
Remove yet another not needed `request` argument in fixture definition.
2017-04-26 10:31:53 +02:00
a9b44c4529
Update docs
...
Remove not needed `request` arg in order to simplify the example.
2017-04-25 16:35:19 +02:00
e02cb6d7ce
restore setuptools_scm write_to usage
2017-04-23 16:59:08 +02:00
314d4afa57
Merge pull request #2367 from nicoddemus/py36-official-travis
...
Test against py36 official release for consistency with other python versions
2017-04-21 23:19:20 +02:00
Bruno Oliveira
Lev Maximov
Floris Bruynooghe
Florian Bruhin
Ronny Pfannschmidt
Ronny Pfannschmidt
Dmitri Pribysh
David Giese
Vitaly Lashmanov
Krzysztof Szularz