diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-04 20:05:50 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-07 11:34:45 +0200 |
| commit | 53f6c3948e048fd8c639704a385f4beae01ebfd9 (patch) | |
| tree | 0b5912410d65037322af2e52bb0f9fba825b4a9f /requirements.txt | |
| parent | 6c6b03b310cf60b251a52127901431f7d059e45f (diff) | |
Leverage on pbr (Python Build Reasonableness)
pbr can inject requirements into the install_requires, tests_require
and/or dependency_links arguments to setup. They were previously
falsy unset.
It also supports conditional dependencies which can be added to the
requirements (e.g. subprocess32; python_version=='2.7').
Then requirements.py3.txt is removed.
It also removes functest/cli/setup.py which seems false and obsolete.
Dockerfile is updated as well. One temporarily link is created because
of several hardcoded paths in Functest.
Change-Id: I14b3b25e07fbac490dd1d5ce943ec02c5b11f242
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'requirements.txt')
| -rw-r--r-- | requirements.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/requirements.txt b/requirements.txt index ef6b2f1c8..787aeaf4a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,14 +20,14 @@ requests==2.9.1 robotframework==3.0.2 robotframework-httplibrary==0.4.2 robotframework-requests==0.4.7 -robotframework-sshlibrary==2.1.3 +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 scp==0.10.2 paramiko==2.1.2 -subprocess32 +subprocess32; python_version=='2.7' shyaml dnspython Pillow==3.3.0 @@ -37,6 +37,6 @@ mock==1.3.0 iniparse==0.4 PrettyTable>=0.7.1,<0.8 # BSD six>=1.9.0 # MIT -git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules -git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests -git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps +opnfv +baro_tests +snaps |