diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + # RhodeCode VCSServer provides access to different vcs backends via network. # Copyright (C) 2014-2019 RodeCode GmbH # @@ -20,22 +21,48 @@ from setuptools import setup, find_packages import os +import re import sys import pkgutil import platform import codecs -try: # for pip >= 10 +import pip + +pip_major_version = int(pip.__version__.split(".")[0]) +if pip_major_version >= 20: from pip._internal.req import parse_requirements -except ImportError: # for pip <= 9.0.3 + from pip._internal.network.session import PipSession +elif pip_major_version >= 10: + from pip._internal.req import parse_requirements + from pip._internal.download import PipSession +else: from pip.req import parse_requirements - -try: # for pip >= 10 - from pip._internal.download import PipSession -except ImportError: # for pip <= 9.0.3 from pip.download import PipSession +def get_package_name(req_object): + package_name = None + try: + from pip._internal.req.constructors import install_req_from_parsed_requirement + except ImportError: + install_req_from_parsed_requirement = None + + # In 20.1 of pip, the requirements object changed + if hasattr(req_object, 'req'): + package_name = req_object.req.name + + if package_name is None: + if install_req_from_parsed_requirement: + package = install_req_from_parsed_requirement(req_object) + package_name = package.req.name + + if package_name is None: + # fallback for older pip + package_name = re.split('===|<=|!=|==|>=|~=|<|>', req_object.requirement)[0] + + return package_name + if sys.version_info < (2, 7): raise Exception('VCSServer requires Python 2.7 or later') @@ -62,14 +89,15 @@ def _get_requirements(req_filename, excl parsed = parse_requirements(os.path.join(here, req_filename)) requirements = [] - for ir in parsed: - if ir.req and ir.name not in exclude: - requirements.append(str(ir.req)) + for int_req in parsed: + req_name = get_package_name(int_req) + if req_name not in exclude: + requirements.append(req_name) return requirements + extras # requirements extract -setup_requirements = ['pytest-runner'] +setup_requirements = [] install_requirements = _get_requirements( 'requirements.txt', exclude=['setuptools']) test_requirements = _get_requirements( @@ -113,7 +141,7 @@ setup( keywords=keywords, license=__license__, author=__author__, - author_email='admin@rhodecode.com', + author_email='support@rhodecode.com', url=__url__, setup_requires=setup_requirements, install_requires=install_requirements,