diff options
| author | IWASE Yusuke <iwase.yusuke0@gmail.com> | 2016-11-15 11:23:14 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-11-15 20:58:06 +0900 |
| commit | 03f77e7279d3e7f4c0c581f32cb99322e65195a6 (patch) | |
| tree | f546bce82233ad7d253ff323c84a7e974e0e694e /tools/install_venv.py | |
| parent | 1af384fa17e58d52a5b1826fa3f2ce3a5b1b260a (diff) | |
pip: Separate test-requires
Currently, in addition to "requirements for tests", test-requires
includes "optional requirements".
This makes it unclear to identify which packages are surely required
to use optional features (e.g., OF-Config, NETCONF, BGP speaker) and
causes the redundant installation when building Docker images.
This patch separates test-requires into two files("test requirements"
and "optional requirements").
Also, this patch reverts the version fixation for some packages.
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'tools/install_venv.py')
| -rw-r--r-- | tools/install_venv.py | 3 |
1 files changed, 3 insertions, 0 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" |