diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-12 05:33:30 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-12 12:06:18 +0200 |
| commit | 0734511bdb372d44f494bf917b2253062e7b9501 (patch) | |
| tree | d3b9262a52d0bb41f1b0a73675275ff2e7865776 | |
| parent | 82efe6ad203fe95ce8a092e5a9a85e326aaef7d7 (diff) | |
Update modules/(test-)requirements
It updates requirements.txt and test-requirements.txt according to
OpenStack stable/ocata. It also fixes install_requires and
test_requires in modules/setup.py.
Change-Id: I9290db34e7bc1c78200130dd6a67d2d33dbc388d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -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 |