diff options
| author |   Serena Feng <feng.xiaowei@zte.com.cn> | 2017-07-19 09:47:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-19 09:47:45 +0000 |
| commit | 8a65233f2d7d326f7ac7d2c9f6c7d6f7185c260b (patch) | |
| tree | de8276fcbce63a415842336903f1ce9f015412f6 | |
| parent | 29b23b5a78b919b88545bc1afed772963a6c66d9 (diff) | |
| parent | 7ccbdc491e56e86c1c7a3ecaf5cfe827740d6506 (diff) | |
Merge "leverage openstack's requirements rule"
| -rw-r--r-- | utils/test/testapi/requirements.txt | 10 | ||||
| -rw-r--r-- | utils/test/testapi/test-requirements.txt | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/utils/test/testapi/requirements.txt b/utils/test/testapi/requirements.txt index d2a45dcd0..4b6f75c10 100644 --- a/utils/test/testapi/requirements.txt +++ b/utils/test/testapi/requirements.txt @@ -2,9 +2,9 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr==2.0.0 -setuptools>=16.0 -tornado>=3.1,<=4.3 +pbr>=2.0.0,!=2.1.0 # Apache-2.0 +setuptools>=16.0,!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2 # PSF/ZPL +tornado>=3.1,<=4.3 # Apache-2.0 epydoc>=0.3.1 -six>=1.9.0 -motor +six>=1.9.0 # MIT +motor # Apache-2.0 diff --git a/utils/test/testapi/test-requirements.txt b/utils/test/testapi/test-requirements.txt index 3bead7987..233f4652b 100644 --- a/utils/test/testapi/test-requirements.txt +++ b/utils/test/testapi/test-requirements.txt @@ -2,9 +2,9 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -coverage -mock>=2.0 -nose>=1.3.1 -pytest -pytest-cov -pytest-mock +coverage>=4.0,!=4.4 # Apache-2.0 +mock>=2.0 # BSD +nose # LGPL +pytest # MIT +pytest-cov # MIT +pytest-mock # MIT |