Bruno Oliveira
a4a30ae4a2
Merge pull request #2123 from oscarh/documentation-issue-687
...
Also update yield teardown for Issue #687
2016-12-07 12:46:43 -02:00
Oscar Hellström
f42a954cb3
Also update yield teardown for Issue #687
2016-12-07 15:08:38 +01:00
Ronny Pfannschmidt
9c285dfc1d
fix #2118 - rework Node._getcustomclass and Node compat properties
2016-12-06 09:13:25 +01:00
Bruno Oliveira
8afca5d0fa
Add release dates to CHANGELOG entry
...
Fix #721
2016-12-05 17:21:01 -02:00
Bruno Oliveira
3a0a1d2de3
Bump version to 3.0.6.dev0
2016-12-05 12:51:00 -02:00
Bruno Oliveira
6a52afc8c9
Merge pull request #2116 from nicoddemus/release-3.0.5
...
Release 3.0.5
2016-12-05 12:42:32 -02:00
Bruno Oliveira
f592c7746a
Regendocs for 3.0.5
2016-12-05 07:22:06 -05:00
Bruno Oliveira
31f114e51f
Add release announcement for 3.0.5
2016-12-05 10:19:27 -02:00
Bruno Oliveira
833acb9d3c
Finalize CHANGELOG for 3.0.5
2016-12-05 10:07:37 -02:00
Bruno Oliveira
0febd855e1
Bump version to 3.0.5
2016-12-05 10:06:58 -02:00
Ronny Pfannschmidt
3c81f83602
Merge pull request #2113 from nicoddemus/approx-repr-unicode
...
Use a simple ``+-`` ASCII string in the string representation of pytest.approx In Python 2
2016-12-05 13:02:07 +01:00
Bruno Oliveira
57c4489916
Use a simple ``+-`` ASCII string in the string representation of pytest.approx In Python 2
...
Fix #2111
2016-12-02 20:01:53 -02:00
Bruno Oliveira
5365f7c9ca
Merge pull request #2112 from ismail-s/patch-1
...
Fix minor typo
2016-12-02 14:12:06 -02:00
Ismail
1f0401ab62
Fix minor typo
2016-12-02 15:09:38 +00:00
Bruno Oliveira
7480342710
Fix typo in docstring of register_assert_rewrite
2016-12-02 09:22:47 -02:00
Bruno Oliveira
db62f160e1
Merge pull request #2073 from nicoddemus/fix-hookproxy-cache
...
Remove hook proxy cache
2016-12-02 09:07:20 -02:00
Bruno Oliveira
81528ea81f
Remove hook proxy cache
...
Fix #2016
2016-12-02 07:32:11 -02:00
Ronny Pfannschmidt
64193add91
Merge pull request #2110 from nicoddemus/rewrite-warning-pytest-plugins
...
Fix false-positive assert rewrite warnings when using 'pytest_plugins'
2016-12-01 20:33:38 +01:00
Bruno Oliveira
bc0f7e6243
Fix false-positive assert rewrite warnings when using 'pytest_plugins'
...
pytest would emit false positive warnings about assertion-rewrite when a
module appears multiple times in plugins which depend
on other plugins using the 'pytest_plugins' mechanism
2016-12-01 15:50:08 -02:00
Ronny Pfannschmidt
9ed3d76b51
Merge pull request #2108 from lwm/exp-2105
...
Add warning for incorrect passing args to `-o`.
2016-12-01 13:49:24 +01:00
Luke Murphy
c856537e71
Add warning for incorrect passing args to `-o`.
2016-12-01 13:20:42 +01:00
Ronny Pfannschmidt
e612619aea
Merge pull request #2106 from nicoddemus/sys-modules-none
...
Remove support code for earlier Python 3 version in Source.compile
2016-12-01 10:22:32 +01:00
Bruno Oliveira
30f0152ae6
Remove unused import
2016-11-30 22:34:02 -02:00
Bruno Oliveira
f8d195253e
Remove support code for earlier Python 3 version in Source.compile
...
This code leaves None in sys.modules as a side effect but is no longer needed in the Python 3 versions we support.
Fix #2103
2016-11-30 22:23:02 -02:00
Bruno Oliveira
669332b7e0
Merge pull request #2101 from wheerd/doctest-encoding
...
Added doctest encoding command line option
2016-11-30 17:43:42 -02:00
Florian Bruhin
9c224c94f0
Merge pull request #2099 from lwm/fixup-2007
...
Add missing `__test__` check for discovery
2016-11-30 20:23:40 +01:00
Wheerd
2edfc805af
Added "versionadded" for doctest_encoding ini option to docs.
2016-11-30 18:01:00 +01:00
Luke Murphy
f5afd8cb54
Add missing `__test__` check for test discovery.
2016-11-30 17:05:42 +01:00
Manuel Krebber
f8fef07b4c
Fixed the tests for python 2.6
2016-11-30 14:19:07 +01:00
Manuel Krebber
b7fb9fac91
Fixed the documentation for doctest_encoding.
2016-11-30 14:17:54 +01:00
Manuel Krebber
1f62e5b5a0
Added CHANGELOG entry and myself to AUTHORS.
2016-11-30 11:50:11 +01:00
Manuel Krebber
c043bbb854
Changed the doctest_encoding option to an ini option.
...
Parametrized the tests for it.
2016-11-30 11:43:33 +01:00
Manuel Krebber
929912de29
Changed the tests to pass on python 2 as well.
2016-11-29 14:51:17 +01:00
Manuel Krebber
d254c6b0ae
Added some tests for --docstring-encoding option. Added option to specify encoding for internal testdir._makefile() for the tests.
2016-11-29 12:29:16 +01:00
Manuel Krebber
ed977513ec
Added a console option to specify the encoding to use for doctest files. Defaults to UTF-8.
2016-11-29 12:29:14 +01:00
Bruno Oliveira
8208a77a3e
Merge pull request #2098 from DuncanBetts/master
...
Improved description of functionality for Issue #687
2016-11-28 23:05:27 -02:00
Bruno Oliveira
8b4da9d955
Merge pull request #2100 from blueyed/fix-help-grammar
...
minor: fix grammar with help for --setup-{only,show}
2016-11-28 20:11:56 -02:00
Bruno Oliveira
454d288138
Merge pull request #2097 from lwm/junitxml-warn
...
Add `type` validation.
2016-11-28 20:10:51 -02:00
Daniel Hahler
40cffacadc
minor: fix grammar with help for --setup-{only,show}
2016-11-28 21:33:15 +01:00
Duncan Betts
6473c3d87e
Improved description of functionality for Issue #687
2016-11-28 14:30:25 +00:00
Luke Murphy
4e1609b12e
Add `type` validation.
...
Argparse driven argument type validation is added for the
`--junit-xml` and `--confcutdir` arguments.
The commit partially reverts #2080 . Closes #2089 .
2016-11-28 02:16:01 +01:00
Ronny Pfannschmidt
36eb5b36d1
Merge pull request #2096 from nicoddemus/merge-master-into-features
...
Merge master into features
2016-11-27 20:50:08 +01:00
Bruno Oliveira
b30a6d22c5
Merge branch 'master' into merge-master-into-features
2016-11-27 17:30:40 -02:00
Bruno Oliveira
0735d4549d
Merge pull request #2088 from nmundar/issue-2034
...
Issue 2034
2016-11-27 16:12:31 -02:00
Ronny Pfannschmidt
f25ba4dd0b
Merge pull request #2095 from nicoddemus/readme-example
...
Use "inc" instead of "func" in the snipped on README
2016-11-27 19:11:35 +01:00
Bruno Oliveira
788e394c93
Use "inc" instead of "func" in the snipped on README and doc index
...
"inc" reads better, also fixed the line separators so
they have the same size
2016-11-27 15:49:39 -02:00
Bruno Oliveira
2d7197926a
Improve CHANGELOG entry for #2034
2016-11-27 14:26:30 -02:00
nmundar
0a30f072e6
Show name argment in compatproperty deprecation message
2016-11-27 14:24:55 -02:00
nmundar
0e6ad8e59f
update CHANGELOG and AUTHORS
2016-11-27 14:24:55 -02:00
nmundar
b38fad4b82
Add compatproperty deprecation warning.
2016-11-27 14:24:55 -02:00