Merge with 13.0.2

3da62c79 · Jason R. Coombs · cf8edd7c · 64297dfe · 3da62c79 · 3da62c79
Commit 3da62c79 authored Mar 06, 2015 by Jason R. Coombs
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

.hgtags .hgtags +1 -0

CHANGES.txt CHANGES.txt +7 -0

MANIFEST.in MANIFEST.in +1 -0

No files found.
--- a/.hgtags
+++ b/.hgtags
@@ -198,3 +198,4 @@ bf8c5bcacd49bf0f9648013a40ebfc8f7c727f7b 12.0.3
 297931cb8cac7d44d970adb927efd6cb36ac3526 12.4
 df34cc18624279faffdbc729c0a11e6ab0f46572 13.0
 ae1a5c5cf78f4f9f98c054f1c8cec6168d1d19b4 13.0.1
+e22a1d613bddf311e125eecd9c1e1cad02ab5063 13.0.2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,13 @@ CHANGES
  using the "install-dir" and "scripts-dir" parameters to easy_install
  through an appropriate distutils config file.

+------
+13.0.2
+------
+
+* Issue #359: Include pytest.ini in the sdist so invocation of py.test on the
+  sdist honors the pytest configuration.
+
 ------
 13.0.1
 ------

--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -9,3 +9,4 @@ include *.txt
 include MANIFEST.in
 include launcher.c
 include msvc-build-launcher.cmd
+include pytest.ini