From 26ee7cbe9162090c75ec0e085a2eff5ac36c63ea Mon Sep 17 00:00:00 2001 From: Mathieu Duret Date: Wed, 27 Jun 2018 23:02:50 +0200 Subject: [PATCH] maj tricks https://github.com/spiral-project/ihatemoney/pull/341 --- setup.py | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/setup.py b/setup.py index a534fe48..974a70f7 100644 --- a/setup.py +++ b/setup.py @@ -3,24 +3,6 @@ import codecs import os from setuptools import setup, find_packages -import pip -if pip.__version__ < "10": - try: - from pip.req import parse_requirements - from pip.download import PipSession - except ImportError: - print('Cannot find pip.') - raise - # Get requirements from the requirements.txt file. - pip_requirements = parse_requirements("requirements.txt", session=PipSession()) - install_requires = [str(ir.req) for ir in pip_requirements] -else: - def parse_requirements(filename): - """ load requirements from a pip requirements file """ - lineiter = (line.strip() for line in open(filename)) - return [line for line in lineiter if line and not line.startswith("#")] - install_requires = parse_requirements('requirements.txt') - here = os.path.abspath(os.path.dirname(__file__)) @@ -31,6 +13,13 @@ def read_file(filename): return content +def parse_requirements(filename): + """ load requirements from a pip requirements file """ + with open(filename) as lines: + lineiter = (line.strip() for line in lines) + return [line for line in lineiter if line and not line.startswith("#")] + + README = read_file('README.rst') CHANGELOG = read_file('CHANGELOG.rst') @@ -67,5 +56,5 @@ setup(name='ihatemoney', packages=find_packages(), include_package_data=True, zip_safe=False, - install_requires=install_requires, + install_requires=parse_requirements('requirements.txt'), entry_points=ENTRY_POINTS)