diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/install_venv.py | 3 | ||||
| -rw-r--r-- | tools/optional-requires | 4 | ||||
| -rw-r--r-- | tools/test-requires | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py index 09b321bd..29639801 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -31,6 +31,7 @@ import sys ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) VENV = os.path.join(ROOT, '.venv') PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires') +OPTIONAL_REQUIRES = os.path.join(ROOT, 'tools', 'optional-requires') TEST_REQUIRES = os.path.join(ROOT, 'tools', 'test-requires') PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) @@ -95,6 +96,8 @@ def install_dependencies(venv=VENV): run_command(['tools/with_venv.sh', 'pip', 'install', '-r', PIP_REQUIRES], redirect_output=False) run_command(['tools/with_venv.sh', 'pip', 'install', '-r', + OPTIONAL_REQUIRES], redirect_output=False) + run_command(['tools/with_venv.sh', 'pip', 'install', '-r', TEST_REQUIRES], redirect_output=False) # Tell the virtual env how to "import quantum" diff --git a/tools/optional-requires b/tools/optional-requires new file mode 100644 index 00000000..a17b1752 --- /dev/null +++ b/tools/optional-requires @@ -0,0 +1,4 @@ +lxml # OF-Config +ncclient # OF-Config +cryptography!=1.5.2 # Required by paramiko +paramiko # NETCONF, BGP speaker (SSH console) diff --git a/tools/test-requires b/tools/test-requires index 009adfc3..9d59a70c 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -4,8 +4,3 @@ nose pep8 pylint formencode -lxml; platform_python_implementation != 'PyPy' # OF-Config -lxml==3.4.0; platform_python_implementation == 'PyPy' -cryptography==1.5 -paramiko # NETCONF, BGP speaker -ncclient # OF-Config |