diff options
| -rw-r--r-- | docs/developer-guide.txt | 41 | ||||
| -rw-r--r-- | docs/development.txt | 1 | ||||
| -rwxr-xr-x | setup.cfg | 1 | ||||
| -rw-r--r-- | setuptools/dist.py | 13 |
4 files changed, 50 insertions, 6 deletions
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt new file mode 100644 index 00000000..fbee5e67 --- /dev/null +++ b/docs/developer-guide.txt @@ -0,0 +1,41 @@ +================================ +Developer's Guide for Setuptools +================================ + +If you want to know more about contributing on Setuptools, this is the place. + + +.. contents:: **Table of Contents** + + +---------------------- +Repository and Tracker +---------------------- + +... + +.. git mirror + +----------------- +Authoring Tickets +----------------- + +... + +------------------------ +Submitting Pull Requests +------------------------ + +Use Mercurial bookmarks or Git branches. Use incremental commits. Minimize +stylistic changes. + +------------------- +Semantic Versioning +------------------- + +Setuptools follows ``semver`` with some exceptions: + +- Uses two-segment version when three segment version ends in zero +- Omits 'v' prefix for tags. + +.. explain value of reflecting meaning in versions. diff --git a/docs/development.txt b/docs/development.txt index ba927c73..e35ba39b 100644 --- a/docs/development.txt +++ b/docs/development.txt @@ -30,6 +30,7 @@ setuptools changes. You have been warned. .. toctree:: :maxdepth: 1 + .. developer-guide formats releases @@ -22,3 +22,4 @@ universal=1 [pytest] addopts=--ignore tests/manual_test.py --ignore tests/shlib_test +norecursedirs=dist build *.egg diff --git a/setuptools/dist.py b/setuptools/dist.py index 7713bf02..8de95a38 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -280,12 +280,13 @@ class Distribution(_Distribution): def fetch_build_eggs(self, requires): """Resolve pre-setup requirements""" - from pkg_resources import working_set, parse_requirements - for dist in working_set.resolve( - parse_requirements(requires), installer=self.fetch_build_egg, - replace_conflicting=True - ): - working_set.add(dist, replace=True) + resolved_dists = pkg_resources.working_set.resolve( + pkg_resources.parse_requirements(requires), + installer=self.fetch_build_egg, + replace_conflicting=True, + ) + for dist in resolved_dists: + pkg_resources.working_set.add(dist, replace=True) def finalize_options(self): _Distribution.finalize_options(self) |