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
ee284ec587
Set version to 3.0.3.dev0
...
Also, using "dev0" as development suffix otherwise distutils gives a warning during "setup.py develop":
UserWarning: Normalizing '3.0.3.dev' to '3.0.3.dev0'
normalized_version,
2016-09-01 21:34:54 -03:00
927f411ee2
Fix release 3.0.2 release announcement list of authors
2016-09-01 21:28:30 -03:00
919f50a3bd
Merge pull request #1896 from nicoddemus/release-3.0.2
...
Release 3.0.2
2016-09-01 21:19:50 -03:00
4e58c9a7d0
Fix use of deprecated getfuncargvalue method in the internal doctest plugin
...
Fix #1898
2016-09-01 07:19:11 -04:00
a9f3053f72
Fix version typo in announce for 3.0.2
2016-09-01 06:59:31 -04:00
d512e7f26b
Run regendoc for 3.0.2 release
2016-08-31 20:32:05 -04:00
f985f47a02
Fix reportingdemo call to pytest
2016-08-31 20:30:06 -04:00
4c45b93007
Changes for 3.0.2 release
2016-08-31 20:28:38 -04:00
a094fb3aa6
Merge pull request #1890 from mbyt/disable_tearDown_and_cleanups_for_post_mortem_debugging
...
unittest runner: avoid tearDown and cleanup to ease post mortem debugging
2016-08-31 21:09:45 -03:00
e43d1174f7
spelling
2016-08-31 22:46:40 +02:00
696a9112be
integrating review commets of @nicoddemus
...
plus small scale refactoring
2016-08-31 22:33:47 +02:00
be08223d5a
Merge branch 'master' into disable_tearDown_and_cleanups_for_post_mortem_debugging
...
Conflicts:
CHANGELOG.rst
2016-08-31 20:35:31 +02:00
10b3274924
adding corresponding test, authors and changelog
2016-08-31 20:22:54 +02:00
67ba8aaaa2
Merge pull request #1891 from nicoddemus/find-spec-rewrite-hook
...
Fix issue pytest_plugins as string was marking wrong modules for rewrite
2016-08-31 05:23:33 +02:00
edf8283bd8
Add CHANGELOG entry for #1888
2016-08-30 23:13:27 -03:00
Floris Bruynooghe
Ronny Pfannschmidt
mbyt
Bruno Oliveira
Ronny Pfannschmidt
Florian Bruhin
Florian Bruhin
Huayi Zhang