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
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
6db2f315fa
Explain a bad scope value to the user
2016-09-21 16:40:58 -04:00
d75748ef6f
test for calling set_trace with custom pdb cls
2016-09-21 09:45:26 +00:00
c7b4b8cf6f
test
2016-09-21 09:45:23 +00:00
0ac85218d1
allow pdbcls without implying usepdb
2016-09-21 09:45:20 +00:00
7660a19d0a
Merge pull request #1945 from axil/master
...
AttributeError chaining bug #1944 fix
2016-09-20 08:36:04 +02:00
8cba033bbb
added a test
2016-09-20 02:47:59 +07:00
6b56c36ae7
added to changelog and authors
2016-09-20 02:47:59 +07:00
65be1231b1
AttributeError chaining bug #1944 fix
2016-09-20 02:20:13 +07:00
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
01db0f1cd1
Merge pull request #1923 from RonnyPfannschmidt/mark-internal-value
...
use consistent inner repressentation for marks
2016-09-19 15:30:22 +01:00
4df74a5cfb
Add AUTHORS and CHANGELOG for #1512
2016-09-19 15:29:37 +01:00
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
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
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
5b260d80f9
Merge pull request #1883 from RonnyPfannschmidt/kill-memoized-call
...
Kill memoized call
2016-09-19 12:47:52 +01:00
8639bf7554
fixup! Merge pkg_resources workaround
2016-09-19 10:20:36 +01:00
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
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
77d842ceb2
better doc for #1890 based on #1932
2016-09-17 19:58:27 +02:00
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
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
04cf5e1df4
Fixed assertion rewriting for plugins in development mode
...
Fix #1934
2016-09-14 21:59:33 -03:00
138e255631
Remove duplicated for Metafunc members on docs
...
Fix #1924
2016-09-14 17:11:58 -03:00
45524241a5
mark: fix introduced linting error
2016-09-08 10:16:45 +02:00
1812387bf0
Mark: fix python 3 compatibility
2016-09-08 10:03:45 +02:00
10094a3f09
use consistent inner repressentation for marks
2016-09-08 09:52:22 +02:00
51378aba01
Merge pull request #1919 from The-Compiler/pdf
...
Fix link to PDF docs
2016-09-07 16:23:26 -03:00
8e67dd13e7
Fix link to PDF docs
...
Fixes #1917
2016-09-06 21:17:54 +02:00
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
a2b8981b50
docs: remove unused helper script
2016-09-05 21:03:22 +02:00
1c9bd9278e
Merge pull request #1913 from flub/builtin-assertion
...
Remove BuiltinAssertionError
2016-09-05 16:53:13 +02:00
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
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
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
e1674f60e7
remove memocollect anmd memoized_call
2016-09-05 14:41:28 +02:00
e572c16d3f
remove memoizedcall in Module
2016-09-05 14:41:28 +02:00
b6f766ae87
Merge pull request #1912 from flub/reg-assert-rewrite-changelog
...
Mention register_assert_rewrite explicitly
2016-09-05 14:36:05 +02:00
ceeb5149f3
Mention register_assert_rewrite explicitly
...
It helps mentioning this explicitly in the changelog.
Fixes #1871 .
2016-09-05 13:09:36 +01:00
b38cf77562
Merge pull request #1911 from irachex/patch-1
...
Fix keyword docs
2016-09-05 11:27:49 +02:00
c60854474a
Fix keyword docs
2016-09-05 16:48:04 +08:00
c69fbd79a9
Merge pull request #1910 from nicoddemus/monkeypatch-members-docs
...
Fix reference docs for monkeypatch
2016-09-03 21:13:54 +02:00
183f3737d4
Fix reference docs for monkeypatch
...
Fix #1909
2016-09-03 15:47:54 -03:00
1e10de574d
The "ids" argument to "parametrize" again accepts unicode strings in Python 2
...
Fixes #1905
2016-09-02 18:38:15 -03:00
722f9eadcd
Merge pull request #1906 from pytest-dev/adjustment-how-to-release
...
Send only minor/major release announces to TIP mailing list
2016-09-02 18:10:29 +02:00
7a4fe7582c
Send only minor/major release announces to TIP mailing list
...
As discussed recently on the testing-in-python mailing list, people have asked
to restrict the amount of announcements there only to major/minor
pytest releases
2016-09-02 12:27:06 -03:00
98ac1dd34b
Merge pull request #1902 from nicoddemus/features
...
Merge master into features after 3.0.2
2016-09-02 06:35:44 +02:00
f5d900d972
Merge remote-tracking branch 'upstream/master' into features
2016-09-01 23:07:49 -03:00
96a1d2941b
Merge pull request #1900 from nicoddemus/finalize-3.0.2-release
...
Finalize 3.0.2 release
2016-09-01 23:05:39 -03:00
Roy Williams
Bruno Oliveira
Tyler Goodlet
David Szotten
Florian Bruhin
Lev Maximov
Floris Bruynooghe
Matthew Duck
Ronny Pfannschmidt
mbyt
Ronny Pfannschmidt
Florian Bruhin
Huayi Zhang