Skip to content

Commit f3c87a7

Browse files
committed
Merge remote-tracking branch 'upstream/master' into release-3.5.0
2 parents 6f95189 + 672239b commit f3c87a7

File tree

8 files changed

+3
-2
lines changed

8 files changed

+3
-2
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ Janne Vanhala
9292
Jason R. Coombs
9393
Javier Domingo Cansino
9494
Javier Romero
95+
Jeff Rackauckas
9596
Jeff Widman
9697
John Eddie Ayson
9798
John Towler

changelog/3245.trivial.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Added ``doc`` to norecursedirs in tox.ini
1+
Renamed example directories so all tests pass when ran from the base directory.

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ rsyncdirs = tox.ini pytest.py _pytest testing
205205
python_files = test_*.py *_test.py testing/*/*.py
206206
python_classes = Test Acceptance
207207
python_functions = test
208-
norecursedirs = .tox ja .hg cx_freeze_source doc
208+
norecursedirs = .tox ja .hg cx_freeze_source
209209
xfail_strict=true
210210
filterwarnings =
211211
error

0 commit comments

Comments
 (0)