diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-06-13 16:50:01 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-07-17 20:32:12 +0200 |
| commit | f377ca166f1e0f81b685e3a76ef0287cdc011cd1 (patch) | |
| tree | 01950a61457d2966d3974ef7544f39aef4f2202d /yardstick/common/packages.py | |
| parent | d57f3eefc23b2bdcc7eb70b19e09cfd22fc36e25 (diff) | |
Leverage on PBR
It fixes requirements and constraints by switching to PBR [1].
It synchronizes requirements with OpenStack stable/stein and then
adds constraints to pip calls.
It also updates flask-restful-swagger to conform with OpenStack
upper-constraints [2] and the pip API calls.
It updates the unit tests verifying a few package versions.
It stops checking unicodecsv in py3 env which is against the
requirements defined in OpenStack.
It also skips one test indirectly highlighting that the pip usage
is incorrect [3]
[1] http://testresults.opnfv.org/functest/dockerslicing/
[2] https://github.com/rantav/flask-restful-swagger/commit/fd418b50723fe1e79f495aa400a8e9f055a5be27
[3] https://github.com/pypa/pip/issues/3889
Change-Id: I635bdb9d7411e619cee911b633fa8ad591a393a0
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'yardstick/common/packages.py')
| -rw-r--r-- | yardstick/common/packages.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/yardstick/common/packages.py b/yardstick/common/packages.py index f20217fdc..a128b7428 100644 --- a/yardstick/common/packages.py +++ b/yardstick/common/packages.py @@ -16,8 +16,8 @@ import logging import re import pip -from pip import exceptions as pip_exceptions -from pip.operations import freeze +from pip._internal import exceptions as pip_exceptions +from pip._internal.operations import freeze from yardstick.common import privsep @@ -36,7 +36,7 @@ def _pip_main(package, action, target=None): cmd = [action, package, '--upgrade'] if target: cmd.append('--target=%s' % target) - return pip.main(cmd) + return pip._internal.main(cmd) def _pip_execute_action(package, action=ACTION_INSTALL, target=None): |