set setup.py install_requires properly
Let's enable pip to solve the dependency. The code is taken from OpenStack. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
parent
1150dc49c4
commit
f2c6dfe106
41
ryu/utils.py
41
ryu/utils.py
@ -19,6 +19,7 @@ import inspect
|
||||
import logging
|
||||
import os
|
||||
import sys
|
||||
import re
|
||||
|
||||
LOG = logging.getLogger('ryu.utils')
|
||||
|
||||
@ -69,3 +70,43 @@ def round_up(x, y):
|
||||
|
||||
def hex_array(data):
|
||||
return ' '.join(hex(ord(chr)) for chr in data)
|
||||
|
||||
|
||||
# the following functions are taken from OpenStack
|
||||
#
|
||||
# Get requirements from the first file that exists
|
||||
def get_reqs_from_files(requirements_files):
|
||||
for requirements_file in requirements_files:
|
||||
if os.path.exists(requirements_file):
|
||||
with open(requirements_file, 'r') as fil:
|
||||
return fil.read().split('\n')
|
||||
return []
|
||||
|
||||
|
||||
def parse_requirements(requirements_files=['requirements.txt',
|
||||
'tools/pip-requires']):
|
||||
requirements = []
|
||||
for line in get_reqs_from_files(requirements_files):
|
||||
# For the requirements list, we need to inject only the portion
|
||||
# after egg= so that distutils knows the package it's looking for
|
||||
# such as:
|
||||
# -e git://github.com/openstack/nova/master#egg=nova
|
||||
if re.match(r'\s*-e\s+', line):
|
||||
requirements.append(re.sub(r'\s*-e\s+.*#egg=(.*)$', r'\1',
|
||||
line))
|
||||
# such as:
|
||||
# http://github.com/openstack/nova/zipball/master#egg=nova
|
||||
elif re.match(r'\s*https?:', line):
|
||||
requirements.append(re.sub(r'\s*https?:.*#egg=(.*)$', r'\1',
|
||||
line))
|
||||
# -f lines are for index locations, and don't get used here
|
||||
elif re.match(r'\s*-f\s+', line):
|
||||
pass
|
||||
# argparse is part of the standard library starting with 2.7
|
||||
# adding it to the requirements list screws distro installs
|
||||
elif line == 'argparse' and sys.version_info >= (2, 7):
|
||||
pass
|
||||
else:
|
||||
requirements.append(line)
|
||||
|
||||
return requirements
|
||||
|
4
setup.py
4
setup.py
@ -21,6 +21,9 @@ from setuptools import find_packages
|
||||
from setuptools import setup
|
||||
|
||||
from ryu import version
|
||||
from ryu import utils
|
||||
|
||||
requires = utils.parse_requirements()
|
||||
|
||||
doing_bdist = any(arg.startswith('bdist') for arg in sys.argv[1:])
|
||||
|
||||
@ -53,6 +56,7 @@ setup(name='ryu',
|
||||
url='http://osrg.github.com/ryu/',
|
||||
author='Ryu project team',
|
||||
author_email='ryu-devel@lists.sourceforge.net',
|
||||
install_requires=requires,
|
||||
license='Apache License 2.0',
|
||||
packages=find_packages(),
|
||||
scripts=['bin/ryu-manager',
|
||||
|
Loading…
x
Reference in New Issue
Block a user