aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/dist.py
diff options
context:
space:
mode:
Diffstat (limited to 'setuptools/dist.py')
-rw-r--r--setuptools/dist.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 3126cb96..0801ae74 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -260,9 +260,10 @@ class Distribution(_Distribution):
"""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
+ parse_requirements(requires), installer=self.fetch_build_egg,
+ replace_conflicting=True
):
- working_set.add(dist)
+ working_set.add(dist, replace=True)
def finalize_options(self):
_Distribution.finalize_options(self)