diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-09-12 19:40:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-12 19:40:00 +0000 |
| commit | f46512744ee0f9891340c56801f831ede0865f4c (patch) | |
| tree | 5b6708708b14ef28d0769e98ac1978b937bc0a2d | |
| parent | b80f8a1251d7912668d4a93b10d960683d462b2b (diff) | |
| parent | 908edc529fc89332c68431ac4876866923621829 (diff) | |
Merge "Updated from global requirements"
| -rw-r--r-- | requirements.txt | 16 | ||||
| -rw-r--r-- | test-requirements.txt | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/requirements.txt b/requirements.txt index 02b36559..65781c12 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,12 @@ # 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. -pbr!=2.1.0,>=2.0.0 # Apache-2.0 -stevedore>=1.20.0 # Apache-2.0 -PyYAML>=3.12 # MIT -enum34>=1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD -requests>=2.14.2 # Apache-2.0 +pbr!=2.1.0 # Apache-2.0 +stevedore # Apache-2.0 +PyYAML # MIT +enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD +requests # Apache-2.0 robotframework>=3.0 -mock>=2.0.0 # BSD -PrettyTable<0.8,>=0.7.1 # BSD -six>=1.10.0 # MIT +mock # BSD +PrettyTable<0.8 # BSD +six # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 9fd35148..8b6f767a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,13 +1,13 @@ # 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. -coverage!=4.4,>=4.0 # Apache-2.0 -mock>=2.0.0 # BSD -nose>=1.3.7 # LGPL +coverage!=4.4 # Apache-2.0 +mock # BSD +nose # LGPL flake8<2.6.0,>=2.5.4 # MIT pylint==1.4.5 # GPLv2 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7 # BSD sphinx-rtd-theme yamllint -doc8>=0.6.0 # Apache-2.0 -bashate>=0.5.1 # Apache-2.0 +doc8 # Apache-2.0 +bashate # Apache-2.0 |