summaryrefslogtreecommitdiff
path: root/ptr.py
diff options
context:
space:
mode:
authorBenoit Pierre <benoit.pierre@gmail.com>2017-08-30 02:44:02 +0200
committerBenoit Pierre <benoit.pierre@gmail.com>2017-08-30 03:06:24 +0200
commitc63158a93f072e7d2ea3de70b24e583133111541 (patch)
treed7130098c9680b051c7c6b4dd965bf259c33fe20 /ptr.py
parent228cbcb5672579f21601707ba0b23169fb4f423f (diff)
downloadpytest-runner-c63158a93f072e7d2ea3de70b24e583133111541.tar.gz
fix support for --extras
Correctly install extras with no markers.
Diffstat (limited to 'ptr.py')
-rw-r--r--ptr.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ptr.py b/ptr.py
index 8a2da90..06612b2 100644
--- a/ptr.py
+++ b/ptr.py
@@ -104,10 +104,10 @@ class PyTest(orig.test):
matching_extras = (
reqs
for (name, sep, marker), reqs in spec_extras
- # never include extras that fail to pass marker eval
- if self.marker_passes(marker)
# include unnamed extras or all if self.extras indicated
- and (not name or self.extras)
+ if (not name or self.extras)
+ # never include extras that fail to pass marker eval
+ and (not marker or self.marker_passes(marker))
)
results = list(map(dist.fetch_build_eggs, matching_extras))
return _itertools.chain.from_iterable(results)