aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-10-29 22:28:17 -0400
committerJason R. Coombs <jaraco@jaraco.com>2016-10-29 22:28:17 -0400
commitb18391c74e190b99cc358997f30907a5c4d78b00 (patch)
treebe81794d6f5913f81202498101690a7fa1b6ebd8
parent6d05b8dce90985455dce0649e04955985f336b04 (diff)
downloadexternal_python_setuptools-b18391c74e190b99cc358997f30907a5c4d78b00.tar.gz
external_python_setuptools-b18391c74e190b99cc358997f30907a5c4d78b00.tar.bz2
external_python_setuptools-b18391c74e190b99cc358997f30907a5c4d78b00.zip
Backed out changeset e12256c4d32e. Fixes #833. Reopens #274 and reopens #521.
-rw-r--r--CHANGES.rst6
-rwxr-xr-xsetuptools/command/sdist.py5
2 files changed, 11 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index abfbaede..2011b3ca 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
CHANGES
=======
+v28.7.1
+-------
+
+* #833: Backed out changes from #830 as the implementation
+ seems to have problems in some cases.
+
v28.7.0
-------
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index d4ac9efa..9975753d 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -141,6 +141,11 @@ class sdist(sdist_add_defaults, orig.sdist):
self.filelist.extend([os.path.join(src_dir, filename)
for filename in filenames])
+ def _add_defaults_data_files(self):
+ """
+ Don't add any data files, but why?
+ """
+
def check_readme(self):
for f in self.READMES:
if os.path.exists(f):