summaryrefslogtreecommitdiff
path: root/docs/formats.txt
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-01-02 18:38:36 -0500
committerJason R. Coombs <jaraco@jaraco.com>2015-01-02 18:38:36 -0500
commit16ee10c47583a4a2b7480af6fc5a205343acfdfd (patch)
tree7cfbb6d488a92fa01ddb86d6f226f549ad26a01e /docs/formats.txt
parent866ff739f6e64aaaefcf7816263410527c9f55f7 (diff)
parent41f2c5ec8dd669747f3cfd8d6b2ae9a40d219545 (diff)
downloadpython-setuptools-git-16ee10c47583a4a2b7480af6fc5a205343acfdfd.tar.gz
Merge with 10.2.1
--HG-- branch : feature/issue-229
Diffstat (limited to 'docs/formats.txt')
-rw-r--r--docs/formats.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/formats.txt b/docs/formats.txt
index 5c461ecb..9e6fe727 100644
--- a/docs/formats.txt
+++ b/docs/formats.txt
@@ -286,6 +286,12 @@ that can be used to obtain ``Requirement`` objects describing the
project's core and optional dependencies.
+``setup_requires.txt``
+----------------------
+
+Much like ``requires.txt`` except represents the requirements
+specified by the ``setup_requires`` parameter to the Distribution.
+
``dependency_links.txt``
------------------------