9d00615bbf
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2016-10-20 21:51:42 -02:00
82fb63ca2d
Merge pull request #2019 from nicoddemus/fix-metavar-pair-help
...
Fix cmdline help message for custom options with two or more metavars
2016-10-21 01:36:24 +02:00
620b384b69
Fix cmdline help message for custom options with two or more metavars
...
Fix #2004
2016-10-20 20:34:39 -02:00
5cbfefbba0
Merge pull request #2018 from nicoddemus/disable-py35-trial
...
Disable py35-trial while #1989 is not fixed
2016-10-20 23:18:48 +02:00
95007ddeca
Disable py35-trial while #1989 is not fixed
2016-10-20 18:56:54 -02:00
995e60efbf
Merge pull request #2017 from nicoddemus/pytest-main-args-docs
...
Remove example of obsolete pytest.main usage with string
2016-10-20 18:29:54 +02:00
918af99a2a
Remove example of obsolete pytest.main usage with string
2016-10-20 12:30:58 -02:00
c0719a5b4c
Merge pull request #2009 from pytest-dev/RonnyPfannschmidt-patch-docs-remove-main-string
...
docs: remove mention of string args to main
closes #2008
2016-10-18 17:52:15 +02:00
afc1e2b0e1
docs: remove mention of string args to main
...
fixes #2008
string args got deprecated due to the insane amount of edge-cases wrt splitting on windows vs posix
2016-10-18 17:21:40 +02:00
de1614923f
Merge pull request #2000 from nicoddemus/issue-1998
...
Handle import errors with non-ascii messages when importing plugins
2016-10-17 21:13:56 +02:00
bc1f8666aa
Fix link in CHANGELOG for #1853
2016-10-12 18:19:34 -03:00
78eec0d7f8
Handle import errors with non-ascii messages when importing plugins
...
Fix #1998
2016-10-12 18:19:32 -03:00
3301a1c173
Merge pull request #1987 from Budulianin/master
...
Update fixture.rst
2016-10-05 17:01:11 -03:00
65ebc75ee8
Update fixture.rst
...
Removed redundant word
2016-10-05 22:26:13 +03:00
cf13355d3f
Merge pull request #1979 from nicoddemus/show-traceback-during-collection
...
Show traceback during collection
2016-10-05 16:18:43 -03:00
1289cbb9a5
Merge pull request #1988 from nicoddemus/pr-template-small-fixes
...
Mention small doc fixes don't need tests/changelog entries in PR template
2016-10-05 21:10:36 +02:00
10433db225
Mention small doc fixes don't need tests/changelog entries in PR template
2016-10-05 15:36:38 -03:00
50b960c1f0
Add note about not monkey-patching builtins ( #1986 )
...
* Add note about not monkey-patching builtins
Related to #1985
* Mention -s as well
2016-10-05 17:57:40 +02:00
d47ae799a7
Merge pull request #1983 from pytest-dev/fix-1981-improve-ini-options-help-text
...
Fix #1981 , improve ini-options help text
2016-10-04 12:43:42 -03:00
c93a9e3361
Fix #1981 , improve ini-options help text
2016-10-04 14:41:09 +01:00
a1d446b8e8
Display traceback from Import errors using pytest's short representation
...
Also omit pytest's own modules and internal libraries (py and pluggy) in low verbosity
Fix #1976
2016-10-03 21:46:44 -03:00
7d66e4eae1
Display full traceback from Import errors when collecting test modules
...
Fix #1976
2016-10-03 20:47:44 -03:00
fc02003220
Merge pull request #1975 from nicoddemus/pytest-skip-message
...
Pytest skip message
2016-10-01 14:44:49 -03:00
336d7900c5
Fix test about pytest.skip message being used at global level
...
Fix #1959
2016-10-01 13:38:52 -03:00
57bb3c6922
Improve error message when using pytest.skip at module level
...
As discussed in issue #1959 .
2016-10-01 13:38:52 -03:00
4667b4decc
Merge branch 'master' into features
2016-09-29 19:03:26 -03:00
a87b1c79c1
post 3.0.3 release changes
2016-09-29 18:58:17 -03:00
30f3d95aeb
Merge pull request #1973 from nicoddemus/release-3.0.3
...
Release 3.0.3
2016-09-29 18:54:50 -03:00
ba6ecc14c8
Include release-3.0.3 into the announce toctree
2016-09-28 17:16:57 -04:00
41d3b3f4f9
Regendoc for version 3.0.3
2016-09-28 16:36:15 -04:00
dda17994ec
Prepare for 3.0.3 release
2016-09-28 16:33:38 -04:00
427cee109a
Merge pull request #1964 from nicoddemus/pluggy-0.4.0
...
Vendor pluggy 0.4.0
2016-09-27 17:35:51 -03:00
654af0ba25
Merge remote-tracking branch 'upstream/master' into features
2016-09-26 19:32:53 -03:00
30d459e2e3
Merge pull request #1968 from nicoddemus/use-latest-hypothesis
...
Use hypothesis >= 3.5.2
2016-09-26 15:01:09 +02:00
f31447b82b
Use hypothesis >= 3.5.2
...
Related to #1962
2016-09-26 09:08:30 -03:00
b071fdc633
Merge pull request #1960 from nicoddemus/skip-module-level-doc
...
Add a note about pytest.skip not being allowed at module level
2016-09-26 08:37:14 +02:00
19766ef0bc
Add a summary on how to skip all tests in a module in different situations
2016-09-25 23:36:25 -03:00
94155ee62a
Add a note about pytest.skip not being allowed at module level
2016-09-25 23:36:25 -03:00
835328d862
Vendor pluggy 0.4.0
...
Fix #1637
2016-09-25 23:36:02 -03:00
8dc497b54b
Merge pull request #1966 from nicoddemus/disable-pypy-windows
...
Disable pypy on AppVeyor until #1963 gets fixed
2016-09-25 23:34:59 -03:00
da201c7d29
Disable pypy on AppVeyor until #1963 gets fixed
2016-09-25 23:21:37 -03:00
01068e5571
Merge pull request #1962 from nicoddemus/fix-ci
...
Pin hypothesis to 3.5.0 because 3.5.1 breaks the test suite
2016-09-25 21:17:17 -03:00
3fce78498f
Mention #1952 on the CHANGELOG
...
Also created "New Features" and "Changes" sections.
2016-09-25 20:31:03 -03:00
5e96edd435
Merge pull request #1952 from davidszotten/pdbcls_without_pdb_on_fail
...
Pdbcls without pdb on fail
2016-09-25 20:24:45 -03:00
73cab77249
Pin hypothesis to 3.5.0 because 3.5.1 breaks the test suite
...
Related to HypothesisWorks/hypothesis-python#368
2016-09-25 18:52:27 -03:00
09bcf7f170
Merge pull request #1958 from rowillia/master
...
Remove implementation of `__getslice__`
2016-09-24 08:39:58 -03:00
f1c4cfea2c
Remove implementation of `__getslice__`
...
`__getslice__` has been Deprecated since Python 2.0 and is removed in Python 3. See
https://docs.python.org/2/reference/datamodel.html#object.__getslice__
Unfortunately, Python 2 will still dispatch to `__getslice__` over `__getitem__`, See
http://bugs.python.org/issue2041 , which causes Warnings when running with `-3` in 2.7.
2016-09-23 09:52:30 -07:00
e5deb8a927
Merge pull request #1955 from rowillia/fix_python3_deprecation_warnings
...
Fix `DeprecationWarnings` found when running py.test in Python 2.7 with the -3 flag.
2016-09-22 17:37:52 -03:00
24db3c123d
Explicitly set to None to have consistent behavior in Python 2 and Python 3
2016-09-22 09:22:12 -07:00
940ed7e943
Fix `DeprecationWarnings` found when running py.test in Python 2.7 with the -3 flag.
...
Running through some of my tests with the `-3` flag in python2.7 I encountered some errors within py.test itself. This fixes those errors so we can use py.test in order to identify problems with Python 3.
2016-09-21 17:44:25 -07:00
Bruno Oliveira
Ronny Pfannschmidt
Grigorii Eremeev
Florian Bruhin
Tom V
Nikolaus Rath
Roy Williams