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
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
25371ddbfd
Merge pull request #2315 from RonnyPfannschmidt/namespace-hook
...
remove pytest internal usage of the namespace hook
2017-04-21 16:24:20 -03:00
80225ce72c
Merge pull request #2374 from Kodiologist/getmodpath-file-ext
...
Try not to assume a module's file extension is .py
2017-04-21 16:23:25 -03:00
4242bf6262
use unknown to specify unknown versions
2017-04-20 21:46:58 +02:00
dcefb287fc
Try not to assume a module's file extension is .py
2017-04-19 12:26:56 -07:00
2cf422733c
restore linting, drop _pytest._version for check-manifest
2017-04-19 20:25:53 +02:00
c0a51f5662
restore check-manifst functionality
2017-04-19 20:12:38 +02:00
31e6fe8f52
HOWTORELEASE.tst: use restructuredtext autonumbering
2017-04-19 19:40:42 +02:00
c3aee4b1e6
second take at setuptools_scm
...
since setuptools 18.6 fixes the issues with develop installs
https://github.com/pypa/setuptools/blob/master/CHANGES.rst#186
https://github.com/pypa/setuptools/issues/439
2017-04-19 19:40:42 +02:00
581b463b60
Merge pull request #2372 from nicoddemus/pytest-dont-rewrite-docs
...
Document PYTEST_DONT_REWRITE
2017-04-19 13:49:12 +02:00
90be44c812
Document PYTEST_DONT_REWRITE
...
Fixes #2203
2017-04-19 08:19:19 -03:00
80cabca21a
Merge pull request #2292 from nicoddemus/defer-hook-checking
...
Verify hooks after collection completes
2017-04-19 13:04:03 +02:00
cac82e71d8
Improve item.warn handling of fslocation parameter
...
Just pass fslocation forward and let the hook implementer decide what to do with the parameter
2017-04-13 19:01:14 -03:00
6e2bbe88b1
Test against py36 official release for consistency with other python versions
2017-04-13 17:54:56 -03:00
d9a2e70155
Change LsofFdLeakChecker to emit a warning instead of failing when detecting leaked FDs
...
Related to #2366
2017-04-13 17:34:48 -03:00
7dfdfa5813
Merge pull request #2359 from pytest-dev/fix-2343
...
Fix #2343 : Replace version checks by constants.
2017-04-12 07:58:15 -03:00
7d4ac14a31
Fix #2343 : Replace version checks by constants.
...
This way they do not have to be recomputed at runtime.
2017-04-12 08:18:09 +02:00
731776702d
Fix hook name in LsofFdLeakChecker
2017-04-11 21:55:12 -03:00
0baf5e1499
Fix test that expected "unknown hook" error on stderr
2017-04-11 21:55:12 -03:00
83c508eea3
Verify hooks after collection completes
...
Fix #1821
2017-04-11 21:55:12 -03:00
78ac1bf5d1
Merge pull request #2350 from nicoddemus/future-imports-rewrite
...
Ensure rewritten modules don't inherit __future__ flags from pytest
2017-04-11 20:59:05 -03:00
02da278894
Merge pull request #2357 from ojii/lastfailed-failedfirst
...
Changed behavior if --lf and --ff are both used.
2017-04-11 19:05:01 -03:00
1125786e78
Improve --lf/--ff test as commented during review
2017-04-11 17:55:55 -03:00
08d83a5c6a
updated changelog and authors files
2017-04-10 17:50:18 +09:00
0ab85e7a9c
Changed behavior if --lf and --ff are both used.
...
When using both --last-failed/--lf and --failed-first/--ff pytest would
run all tests with failed tests first (as if --lf was not provied). This
patch changes it so that when using both flags, only the last failed
tests are run. This makes it easier to set --ff as the default behavior
via the config file and then selectively use --lf to only run the last
failed tests.
2017-04-10 17:46:13 +09:00
47a2a77cb4
Merge pull request #2354 from shobute/patch-1
...
Corrected documentation typo in fixtures.py
2017-04-07 14:31:36 -03:00
21f1c2b03f
Update fixtures.py
...
Corrected "or or" typo in docstring (and made indentation consistent).
2017-04-07 16:48:38 +01:00
8c69d5c939
Merge pull request #1940 from skylarjhdownes/master
...
adding documentation about pointing pytest at source files
2017-04-06 23:40:15 -03:00
f2300fbab2
Fix links in docs
2017-04-06 23:29:41 -03:00
45852386e5
Fix small typo in docs
2017-04-06 23:02:47 -03:00
5462697924
Small formatting fixes to nose.rst
2017-04-06 23:01:26 -03:00
639c592f31
Add missing link in CHANGELOG
2017-04-06 22:59:24 -03:00
f7caa56a6b
moved documentation of conftest.py hack to nose.rst
2017-04-06 18:01:03 -07:00
3aa4fb62d6
Merge branch 'master' into master
2017-04-06 16:35:38 -07:00
Ronny Pfannschmidt
Bruno Oliveira
Florian Bruhin
Vitaly Lashmanov
Ronny Pfannschmidt
Krzysztof Szularz
Kodi Arfer
Michael Howitz
Jonas Obrist
Ben Lloyd
Skylar Downes