aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-09-03 13:39:30 -0400
committerGitHub <noreply@github.com>2017-09-03 13:39:30 -0400
commit10bcb50aef7dda858b0c351059778d265697ceb0 (patch)
treeccfa29eeb92e4afb2368c4a5eca9e97e744b18d9
parentf7e27cc04a9db9952dd1cdeee7e9b0a8b779f0d0 (diff)
parent7944b2b156cc49e6aeec83a8179bc4ce23496c82 (diff)
downloadexternal_python_setuptools-10bcb50aef7dda858b0c351059778d265697ceb0.tar.gz
external_python_setuptools-10bcb50aef7dda858b0c351059778d265697ceb0.tar.bz2
external_python_setuptools-10bcb50aef7dda858b0c351059778d265697ceb0.zip
Merge pull request #1133 from sgaist/add_markdown_to_possible_readmes
Improve README file list handling and add Markdown to the current list
-rw-r--r--CHANGES.rst3
-rwxr-xr-xsetuptools/command/sdist.py3
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index c4eb0e41..ced6630c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -16,6 +16,9 @@ v36.4.0
distributions (e.g. when using ``setup_requires`` with a conflicting
transitive dependency, fix #1124).
+* #1133: Improved handling of README files extensions and added
+ Markdown to the list of searched READMES.
+
v36.3.0
-------
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 84e29a1b..7b4d197d 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -37,7 +37,8 @@ class sdist(sdist_add_defaults, orig.sdist):
negative_opt = {}
- READMES = 'README', 'README.rst', 'README.txt'
+ README_EXTENSIONS = ['', '.rst', '.txt', '.md']
+ READMES = tuple('README{}'.format(ext) for ext in README_EXTENSIONS)
def run(self):
self.run_command('egg_info')