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

pytest-dev · Mar 21, 2018 · f3c87a7 · f3c87a7
2 parents 6f95189 + 672239b
commit f3c87a7
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 2 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -92,6 +92,7 @@ Janne Vanhala
 Jason R. Coombs
 Javier Domingo Cansino
 Javier Romero
+Jeff Rackauckas
 Jeff Widman
 John Eddie Ayson
 John Towler

diff --git 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.
diff --git a/...on/global_testmodule_config/test_hello.py → ...bal_testmodule_config/test_hello_world.py b/...on/global_testmodule_config/test_hello.py → ...bal_testmodule_config/test_hello_world.py
diff --git a/doc/en/example/costlysetup/sub1/__init__.py → doc/en/example/costlysetup/sub_a/__init__.py b/doc/en/example/costlysetup/sub1/__init__.py → doc/en/example/costlysetup/sub_a/__init__.py
diff --git a/...en/example/costlysetup/sub1/test_quick.py → ...n/example/costlysetup/sub_a/test_quick.py b/...en/example/costlysetup/sub1/test_quick.py → ...n/example/costlysetup/sub_a/test_quick.py
diff --git a/doc/en/example/costlysetup/sub2/__init__.py → doc/en/example/costlysetup/sub_b/__init__.py b/doc/en/example/costlysetup/sub2/__init__.py → doc/en/example/costlysetup/sub_b/__init__.py
diff --git a/doc/en/example/costlysetup/sub2/test_two.py → doc/en/example/costlysetup/sub_b/test_two.py b/doc/en/example/costlysetup/sub2/test_two.py → doc/en/example/costlysetup/sub_b/test_two.py
diff --git 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