Merge remote-tracking branch 'upstream/master' into release-3.5.0

2018-03-21 20:39:44 +00:00 · 2018-03-21 20:39:44 +00:00 · f3c87a77a7
parent 6f95189cf7 672239b149
commit f3c87a77a7
8 changed files with 3 additions and 2 deletions
--- a/1
+++ b/1
@ -92,6 +92,7 @@ Janne Vanhala
 Jason R. Coombs
 Javier Domingo Cansino
 Javier Romero
 Jeff Rackauckas
 Jeff Widman
 John Eddie Ayson
 John Towler
--- a/changelog/3245.trivial.rst
+++ b/changelog/3245.trivial.rst
@ -1 +1 @@
-Added ``doc`` to norecursedirs in tox.ini
+Renamed example directories so all tests pass when ran from the base directory.
--- a/doc/en/example/assertion/global_testmodule_config/test_hello_world.py
+++ b/doc/en/example/assertion/global_testmodule_config/test_hello_world.py
--- a/doc/en/example/costlysetup/sub_a/init.py
+++ b/doc/en/example/costlysetup/sub_a/init.py
--- a/doc/en/example/costlysetup/sub_a/test_quick.py
+++ b/doc/en/example/costlysetup/sub_a/test_quick.py
--- a/doc/en/example/costlysetup/sub_b/init.py
+++ b/doc/en/example/costlysetup/sub_b/init.py
--- a/doc/en/example/costlysetup/sub_b/test_two.py
+++ b/doc/en/example/costlysetup/sub_b/test_two.py
--- a/tox.ini
+++ b/tox.ini
@ -205,7 +205,7 @@ rsyncdirs = tox.ini pytest.py _pytest testing
 python_files = test_*.py *_test.py testing/*/*.py
 python_classes = Test Acceptance
 python_functions = test
-norecursedirs = .tox ja .hg cx_freeze_source doc
+norecursedirs = .tox ja .hg cx_freeze_source
 xfail_strict=true
 filterwarnings =
    error
		`@ -1 +1 @@`
			Added ``doc`` to norecursedirs in tox.ini				`Renamed example directories so all tests pass when ran from the base directory.`