diff options
author | 2017-06-14 01:48:38 +0000 | |
---|---|---|
committer | 2017-06-14 01:48:38 +0000 | |
commit | 5407b668eecf4407b3f7d61003640323063cd32b (patch) | |
tree | ee412f45f5c4253c5a66a75f90fcc45b4c57e46c | |
parent | fd24cfa3d91695bedf0b9d0c46ab9def833cf856 (diff) | |
parent | 0734511bdb372d44f494bf917b2253062e7b9501 (diff) |
Merge "Update modules/(test-)requirements"
-rw-r--r-- | modules/requirements.txt | 6 | ||||
-rw-r--r-- | modules/setup.py | 10 | ||||
-rw-r--r-- | modules/test-requirements.txt | 8 |
3 files changed, 10 insertions, 14 deletions
diff --git a/modules/requirements.txt b/modules/requirements.txt index bae55dcd2..2793dd4cf 100644 --- a/modules/requirements.txt +++ b/modules/requirements.txt @@ -1,3 +1,3 @@ -paramiko==2.1.2 -mock==1.3.0 -requests==2.9.1 +paramiko>=2.0 # LGPLv2.1+ +mock>=2.0 # BSD +requests!=2.12.2,>=2.10.0 # Apache-2.0 diff --git a/modules/setup.py b/modules/setup.py index 8ac5ceac3..0dd635fbe 100644 --- a/modules/setup.py +++ b/modules/setup.py @@ -17,9 +17,9 @@ setup( package_data={ }, url="https://www.opnfv.org", - install_requires=["paramiko>=2.0.1", - "mock==1.3.0", - "nose==1.3.7", - "coverage==4.1", - "requests==2.9.1"] + install_requires=["paramiko>=2.0", + "mock>=2.0", + "requests!=2.12.2,>=2.10.0"], + test_requires=["nose", + "coverage>=4.0"] ) diff --git a/modules/test-requirements.txt b/modules/test-requirements.txt index 99d7f1313..c264540c0 100644 --- a/modules/test-requirements.txt +++ b/modules/test-requirements.txt @@ -1,6 +1,2 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. - -nose -coverage +nose # LGPL +coverage>=4.0 # Apache-2.0 |