diff --git a/AUTHORS b/AUTHORS index fd942205311..ad9541423d2 100644 --- 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 index b61d9804f42..0b93dc6755a 100644 --- a/changelog/3245.trivial.rst +++ b/changelog/3245.trivial.rst @@ -1 +1 @@ -Added ``doc`` to norecursedirs in tox.ini \ No newline at end of file +Renamed example directories so all tests pass when ran from the base directory. \ No newline at end of file diff --git a/doc/en/example/assertion/global_testmodule_config/test_hello.py b/doc/en/example/assertion/global_testmodule_config/test_hello_world.py similarity index 100% rename from doc/en/example/assertion/global_testmodule_config/test_hello.py rename to doc/en/example/assertion/global_testmodule_config/test_hello_world.py diff --git a/doc/en/example/costlysetup/sub1/__init__.py b/doc/en/example/costlysetup/sub_a/__init__.py similarity index 100% rename from doc/en/example/costlysetup/sub1/__init__.py rename to doc/en/example/costlysetup/sub_a/__init__.py diff --git a/doc/en/example/costlysetup/sub1/test_quick.py b/doc/en/example/costlysetup/sub_a/test_quick.py similarity index 100% rename from doc/en/example/costlysetup/sub1/test_quick.py rename to doc/en/example/costlysetup/sub_a/test_quick.py diff --git a/doc/en/example/costlysetup/sub2/__init__.py b/doc/en/example/costlysetup/sub_b/__init__.py similarity index 100% rename from doc/en/example/costlysetup/sub2/__init__.py rename to doc/en/example/costlysetup/sub_b/__init__.py diff --git a/doc/en/example/costlysetup/sub2/test_two.py b/doc/en/example/costlysetup/sub_b/test_two.py similarity index 100% rename from doc/en/example/costlysetup/sub2/test_two.py rename to doc/en/example/costlysetup/sub_b/test_two.py diff --git a/tox.ini b/tox.ini index c4f3516a617..ac0e04ca0b8 100644 --- 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