summaryrefslogtreecommitdiff
path: root/pkg_resources/__init__.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-03-31 10:25:44 -0400
committerJason R. Coombs <jaraco@jaraco.com>2016-03-31 10:25:44 -0400
commit04d10ff025e1cbef7ec93a2008c930e856045c8a (patch)
tree67327643514eee52422a77e27177325705485451 /pkg_resources/__init__.py
parente7a27ca0a3ba06f69836872342089e7333f24a3a (diff)
downloadpython-setuptools-git-04d10ff025e1cbef7ec93a2008c930e856045c8a.tar.gz
Bypass environment marker evaluation in requirements resolution. Ref #523.
Diffstat (limited to 'pkg_resources/__init__.py')
-rw-r--r--pkg_resources/__init__.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2f35b34d..eb84f4ba 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -804,8 +804,10 @@ class WorkingSet(object):
continue
# If the req has a marker, evaluate it -- skipping the req if
# it evaluates to False.
- if req.marker and not req.marker.evaluate():
- continue
+ # https://github.com/pypa/setuptools/issues/523
+ _issue_523_bypass = True
+ if not _issue_523_bypass and req.marker and not req.marker.evaluate():
+ continue
dist = best.get(req.key)
if dist is None:
# Find the best distribution and add it to the map