From abcb9abb0228159d6ee09cf276f7dcf6c6035b69 Mon Sep 17 00:00:00 2001 From: Andrew Fyfe Date: Thu, 12 Apr 2018 18:54:26 +0100 Subject: [PATCH] PEP508 markers in requirements.txt have been broken since dfabe89 fixes modoboa/modoboa-installer#197 --- setup.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 571a157da..a9984a9db 100644 --- a/setup.py +++ b/setup.py @@ -27,12 +27,10 @@ def get_requirements(requirements_file): requirements = [] if path.isfile(requirements_file): for req in parse_requirements(requirements_file, session="hack"): - # check markers, such as - # - # rope_py3k ; python_version >= '3.0' - # - if req.match_markers(): - requirements.append(str(req.req)) + if req.markers: + requirements.append("%s;%s" % (req.req, req.markers)) + else: + requirements.append("%s" % req.req) return requirements