diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-06-14 10:22:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-14 10:22:51 +0000 |
| commit | 6049af70807987e124ba0cf4f05ee16fe89b88db (patch) | |
| tree | 184641c1aec7d97a71ca2c6c61c2bef6f24dbfdd | |
| parent | fb3ef61a03cdf2fb938d771e9d23f6435cff240f (diff) | |
| parent | ff64d008bfea70efb1c8663adeb29ab175229732 (diff) | |
Merge "Update (test-)requirements.txt"
| -rw-r--r-- | requirements.txt | 52 | ||||
| -rw-r--r-- | setup.py | 17 | ||||
| -rw-r--r-- | test-requirements.txt | 17 |
3 files changed, 40 insertions, 46 deletions
diff --git a/requirements.txt b/requirements.txt index 787aeaf4a..a2b9b62cf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,42 +1,36 @@ -# -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -# -pyyaml==3.10 -gitpython==1.0.1 -python-openstackclient==2.3.0 -python-ceilometerclient==2.6.2 -python-heatclient==1.7.0 -python-keystoneclient==3.5.0 -python-neutronclient==6.0.0 -python-novaclient==6.0.0 -python-congressclient==1.5.0 -python-tackerclient==0.7.0 -pexpect==4.0 -requests==2.9.1 +PyYAML>=3.10.0 # MIT +GitPython>=1.0.1 # BSD License (3 clause) +python-openstackclient>=3.3.0 # Apache-2.0 +python-ceilometerclient>=2.5.0 # Apache-2.0 +python-heatclient>=1.6.1 # Apache-2.0 +python-keystoneclient>=3.8.0 # Apache-2.0 +python-neutronclient>=5.1.0 # Apache-2.0 +python-novaclient!=7.0.0,>=6.0.0 # Apache-2.0 +python-congressclient<2000,>=1.3.0 # Apache-2.0 +python-tackerclient>=0.8.0 # Apache-2.0 +pexpect!=3.3,>=3.1 # ISC License +requests!=2.12.2,>=2.10.0 # Apache-2.0 robotframework==3.0.2 robotframework-httplibrary==0.4.2 robotframework-requests==0.4.7 -robotframework-sshlibrary==2.1.3; python_version=='2.7' +robotframework-sshlibrary==2.1.3;python_version=='2.7' jmespath==0.9.2 configObj==5.0.6 -Flask==0.10.1 -xmltodict==0.9.2 +Flask!=0.11,<1.0,>=0.10 # BSD +xmltodict>=0.10.1 # MIT scp==0.10.2 -paramiko==2.1.2 -subprocess32; python_version=='2.7' +paramiko>=2.0 # LGPLv2.1+ +subprocess32;python_version=='2.7' shyaml -dnspython -Pillow==3.3.0 +dnspython>=1.14.0;python_version=='2.7' # http://www.dnspython.org/LICENSE +dnspython3>=1.12.0,!=1.13.0,!=1.14.0;python_version>='3.0' # http://www.dnspython.org/LICENSE +Pillow>=2.4.0 # PIL License click==6.6 openbaton-cli==2.2.1-beta7 -mock==1.3.0 +mock>=2.0 # BSD iniparse==0.4 -PrettyTable>=0.7.1,<0.8 # BSD +PrettyTable<0.8,>=0.7.1 # BSD six>=1.9.0 # MIT opnfv -baro_tests +baro-tests snaps @@ -9,9 +9,16 @@ # pylint: disable=missing-docstring -from setuptools import setup +import setuptools -setup( - setup_requires=['pbr>=1.9', 'setuptools>=17.1'], - pbr=True, -) +# In python < 2.7.4, a lazy loading of package `pbr` will break +# setuptools if some other modules registered functions in `atexit`. +# solution from: http://bugs.python.org/issue15881#msg170215 +try: + import multiprocessing # noqa +except ImportError: + pass + +setuptools.setup( + setup_requires=['pbr>=1.8'], + pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 9fe4bc749..f22863c7d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,13 +1,6 @@ -# -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -# -coverage==4.1 -mock==1.3.0 -nose==1.3.7 -flake8>=2.5.4,<2.6.0 # MIT +coverage>=4.0 # Apache-2.0 +mock>=2.0 # BSD +nose # LGPL +flake8<2.6.0,>=2.5.4 # MIT pylint==1.4.5 # GPLv2 -sphinx!=1.6.1,>=1.5.1 # BSD +sphinx!=1.3b1,<1.4,>=1.2.1 # BSD |