Florian Bruhin
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
Bruno Oliveira
19766ef0bc
Add a summary on how to skip all tests in a module in different situations
2016-09-25 23:36:25 -03:00
Bruno Oliveira
94155ee62a
Add a note about pytest.skip not being allowed at module level
2016-09-25 23:36:25 -03:00
Bruno Oliveira
835328d862
Vendor pluggy 0.4.0
...
Fix #1637
2016-09-25 23:36:02 -03:00
Bruno Oliveira
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
Bruno Oliveira
da201c7d29
Disable pypy on AppVeyor until #1963 gets fixed
2016-09-25 23:21:37 -03:00
Bruno Oliveira
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
Bruno Oliveira
3fce78498f
Mention #1952 on the CHANGELOG
...
Also created "New Features" and "Changes" sections.
2016-09-25 20:31:03 -03:00
Bruno Oliveira
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
Bruno Oliveira
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
Bruno Oliveira
09bcf7f170
Merge pull request #1958 from rowillia/master
...
Remove implementation of `__getslice__`
2016-09-24 08:39:58 -03:00
Roy Williams
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
Bruno Oliveira
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
Roy Williams
24db3c123d
Explicitly set to None to have consistent behavior in Python 2 and Python 3
2016-09-22 09:22:12 -07:00
Roy Williams
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
f279bd2bd5
Merge pull request #1918 from tgoodlet/explain_bad_scope
...
Explain a bad scope value to the user
2016-09-21 18:58:03 -03:00
Tyler Goodlet
6db2f315fa
Explain a bad scope value to the user
2016-09-21 16:40:58 -04:00
David Szotten
d75748ef6f
test for calling set_trace with custom pdb cls
2016-09-21 09:45:26 +00:00
David Szotten
c7b4b8cf6f
test
2016-09-21 09:45:23 +00:00
David Szotten
0ac85218d1
allow pdbcls without implying usepdb
2016-09-21 09:45:20 +00:00
Florian Bruhin
7660a19d0a
Merge pull request #1945 from axil/master
...
AttributeError chaining bug #1944 fix
2016-09-20 08:36:04 +02:00
Lev Maximov
8cba033bbb
added a test
2016-09-20 02:47:59 +07:00
Lev Maximov
6b56c36ae7
added to changelog and authors
2016-09-20 02:47:59 +07:00
Lev Maximov
65be1231b1
AttributeError chaining bug #1944 fix
2016-09-20 02:20:13 +07:00
Floris Bruynooghe
887c097f8e
Merge pull request #1951 from mattduck/feat/1512-dict-compare-output
...
Feat/1512 dict compare output
2016-09-19 17:34:09 +01:00
Floris Bruynooghe
01db0f1cd1
Merge pull request #1923 from RonnyPfannschmidt/mark-internal-value
...
use consistent inner repressentation for marks
2016-09-19 15:30:22 +01:00
Matthew Duck
4df74a5cfb
Add AUTHORS and CHANGELOG for #1512
2016-09-19 15:29:37 +01:00
Matthew Duck
999e7c6541
Tidy formatting of assertion truncation
...
Part two of https://github.com/pytest-dev/pytest/issues/1512 . Update the format
of the truncation message to help make it clear that pytest truncates the
entire assertion output when verbosity < 2.
2016-09-19 15:27:38 +01:00
Matthew Duck
dd64d823b9
Don't display dict common items if verbosity=1
...
Part one of https://github.com/pytest-dev/pytest/issues/1512 .
If verbosity=1, assertion explanations are truncated at 10 lines. In this
situation, it's more important to tell the user which dictionary items are
different than which are the same.
2016-09-19 15:27:28 +01:00
Floris Bruynooghe
dc16fe2bb9
Merge junit-xml url attribute branch
...
Merge branch 'url_attr' of https://github.com/fushi/pytest into junitxml-url
2016-09-19 12:57:05 +01:00
Floris Bruynooghe
5b260d80f9
Merge pull request #1883 from RonnyPfannschmidt/kill-memoized-call
...
Kill memoized call
2016-09-19 12:47:52 +01:00
Floris Bruynooghe
8639bf7554
fixup! Merge pkg_resources workaround
2016-09-19 10:20:36 +01:00
Floris Bruynooghe
f484e7c9ca
Merge pkg_resources workaround
...
Merge branch 'pkg_resources_bugfix' of github.com:raquel-ucl/pytest into pkg-resources
This is an odd case and doesn't really make sense, it is working around a bug
in maven/jython and the old version or weird packaging of setuptools they use.
But we used to do this in the past so might as well keep doing this.
2016-09-19 10:14:41 +01:00
Ronny Pfannschmidt
2bafa74765
Merge pull request #1942 from mbyt/better_doc_for_1890
...
better doc for #1890 based on #1932
2016-09-17 20:14:44 +02:00
mbyt
77d842ceb2
better doc for #1890 based on #1932
2016-09-17 19:58:27 +02:00
Bruno Oliveira
863b7d0c50
Merge pull request #1933 from pytest-dev/metafunc-members-docs
...
Remove duplicated for Metafunc members on docs
2016-09-15 12:43:54 -03:00
Ronny Pfannschmidt
40ec35767f
Merge pull request #1935 from nicoddemus/assert-rewrite-dev-plugins
...
Fixed assertion rewriting for plugins in development mode
2016-09-15 08:45:23 +02:00
Bruno Oliveira
04cf5e1df4
Fixed assertion rewriting for plugins in development mode
...
Fix #1934
2016-09-14 21:59:33 -03:00
Bruno Oliveira
138e255631
Remove duplicated for Metafunc members on docs
...
Fix #1924
2016-09-14 17:11:58 -03:00
Ronny Pfannschmidt
45524241a5
mark: fix introduced linting error
2016-09-08 10:16:45 +02:00
Ronny Pfannschmidt
1812387bf0
Mark: fix python 3 compatibility
2016-09-08 10:03:45 +02:00
Ronny Pfannschmidt
10094a3f09
use consistent inner repressentation for marks
2016-09-08 09:52:22 +02:00
Bruno Oliveira
51378aba01
Merge pull request #1919 from The-Compiler/pdf
...
Fix link to PDF docs
2016-09-07 16:23:26 -03:00
Florian Bruhin
8e67dd13e7
Fix link to PDF docs
...
Fixes #1917
2016-09-06 21:17:54 +02:00
Bruno Oliveira
99efc281ee
Merge pull request #1914 from RonnyPfannschmidt/docs-remove-getdoctarget
...
docs: remove the need for special scripts
2016-09-05 16:38:41 -03:00
Ronny Pfannschmidt
a2b8981b50
docs: remove unused helper script
2016-09-05 21:03:22 +02:00
Ronny Pfannschmidt
1c9bd9278e
Merge pull request #1913 from flub/builtin-assertion
...
Remove BuiltinAssertionError
2016-09-05 16:53:13 +02:00
Ronny Pfannschmidt
e21ae3991d
docs: remove the need for special scripts
...
* import version from pytest since it is importable
* remove makefile bits from legacy hosting
* remove the script to determine the version for legacy hosting
2016-09-05 16:42:33 +02:00
Floris Bruynooghe
28b1896e9a
Remove BuiltinAssertionError
...
We used to have this when we where patching the real Python
AssertionError for use with reinterpret, but reinterpret is now
gone so we no longer need this as it is not used by rewrite.
2016-09-05 15:29:09 +02:00
Florian Bruhin
8a41b26f56
Merge pull request #1908 from nicoddemus/parametrize-unicode-id
...
The "ids" argument to "parametrize" again accepts unicode strings in Python 2
2016-09-05 15:09:12 +02:00