diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-03-06 11:12:23 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-03-06 11:12:23 -0500 |
| commit | 3da62c7957f183077446caa51a377d06a0a1b8a9 (patch) | |
| tree | 68f55b8ddecf9027c7c921191a32046e71d9c59e | |
| parent | cf8edd7c24a6afdb81ac928f348faeaba77860bf (diff) | |
| parent | 64297dfe3bf0088480b0499b6bb5dc7d5946938b (diff) | |
| download | python-setuptools-git-3da62c7957f183077446caa51a377d06a0a1b8a9.tar.gz | |
Merge with 13.0.2
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rw-r--r-- | MANIFEST.in | 1 |
3 files changed, 9 insertions, 0 deletions
@@ -198,3 +198,4 @@ bf8c5bcacd49bf0f9648013a40ebfc8f7c727f7b 12.0.3 297931cb8cac7d44d970adb927efd6cb36ac3526 12.4 df34cc18624279faffdbc729c0a11e6ab0f46572 13.0 ae1a5c5cf78f4f9f98c054f1c8cec6168d1d19b4 13.0.1 +e22a1d613bddf311e125eecd9c1e1cad02ab5063 13.0.2 diff --git a/CHANGES.txt b/CHANGES.txt index dfb7ba39..608dd77d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -19,6 +19,13 @@ CHANGES 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 ------ diff --git a/MANIFEST.in b/MANIFEST.in index 428bbd1e..8a4523a9 100644 --- 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 |