summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-03-06 11:12:23 -0500
committerJason R. Coombs <jaraco@jaraco.com>2015-03-06 11:12:23 -0500
commit3da62c7957f183077446caa51a377d06a0a1b8a9 (patch)
tree68f55b8ddecf9027c7c921191a32046e71d9c59e /CHANGES.txt
parentcf8edd7c24a6afdb81ac928f348faeaba77860bf (diff)
parent64297dfe3bf0088480b0499b6bb5dc7d5946938b (diff)
downloadpython-setuptools-git-3da62c7957f183077446caa51a377d06a0a1b8a9.tar.gz
Merge with 13.0.2
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt7
1 files changed, 7 insertions, 0 deletions
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
------