From 86d758d841b24509d45dad5cb64056e5c9b26915 Mon Sep 17 00:00:00 2001 From: Andrew Fyfe Date: Sat, 31 Mar 2018 14:39:25 +0100 Subject: [PATCH] revert #1439 changes adding external dependencies to setup.py was a bad idea --- dev-requirements.txt | 1 - setup.py | 18 +++++++++--------- test-requirements.txt | 1 - 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index e2dd90121..06d73f33c 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,3 +1,2 @@ django-bower django-debug-toolbar -packaging diff --git a/setup.py b/setup.py index 3a7a3737d..43abc5c05 100644 --- a/setup.py +++ b/setup.py @@ -13,21 +13,21 @@ from __future__ import unicode_literals import io from os import path -from packaging.requirements import Requirement +from pip.req import parse_requirements from setuptools import find_packages, setup def get_requirements(requirements_file): - """Parse requirements file.""" + """Use pip to parse requirements file.""" requirements = [] if path.isfile(requirements_file): - with io.open(requirements_file, encoding="utf-8") as fp: - for line in fp: - if line.startswith("#") or line.strip() == "": - continue - req = Requirement(line) - if req.marker is None or req.marker.evaluate(): - requirements.append('%s%s' % (req.name, req.specifier)) + 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)) return requirements diff --git a/test-requirements.txt b/test-requirements.txt index 03529194c..45bb850f1 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,4 +5,3 @@ testfixtures==4.7.0 tox psycopg2-binary>=2.7.4 mysqlclient>=1.3.3 -packaging