summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2012-11-30 15:54:12 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2012-11-30 15:54:12 +0900
commitf2c6dfe1066aeecb5fdf2fb1cd5ce6476565fd24 (patch)
tree1a103dbc35ddef07f83d48c7d1ee02dd41eadc62
parent1150dc49c40815b651a8a0db47f10f57bf89618b (diff)
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>
-rw-r--r--ryu/utils.py41
-rw-r--r--setup.py4
2 files changed, 45 insertions, 0 deletions
diff --git a/ryu/utils.py b/ryu/utils.py
index f2da6702..539b8670 100644
--- a/ryu/utils.py
+++ b/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
diff --git a/setup.py b/setup.py
index 4b12fc34..f1915a7a 100644
--- a/setup.py
+++ b/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',