From 34031ba276e184adb870cd22bebd70cc601d74c6 Mon Sep 17 00:00:00 2001 From: Ramakrishnan G Date: Tue, 9 Jun 2015 22:57:24 -0700 Subject: [PATCH] Fix gate failures This commit fixes the gate failures by following changes: * Removes custom pypi mirror in tox.ini * Changes oslo.utils to oslo_utils * Changes oslo.concurrency to oslo_concurrency Change-Id: Iaf3fa7a76aeb72323df40a7317c23c85cb5d920e --- proliantutils/functests/test_hpssa.py | 2 +- proliantutils/hpssa/objects.py | 4 ++-- proliantutils/ipa_hw_manager/hardware_manager.py | 2 +- proliantutils/tests/hpssa/test_objects.py | 2 +- proliantutils/tests/ipa_hw_manager/__init__.py | 2 +- proliantutils/tests/ipa_hw_manager/test_hardware_manager.py | 2 +- requirements.txt | 4 ++-- tox.ini | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/proliantutils/functests/test_hpssa.py b/proliantutils/functests/test_hpssa.py index cb2fde0..186f05e 100644 --- a/proliantutils/functests/test_hpssa.py +++ b/proliantutils/functests/test_hpssa.py @@ -15,7 +15,7 @@ import glob import os import stat -from oslo.concurrency import processutils +from oslo_concurrency import processutils import testtools from proliantutils.hpssa import constants diff --git a/proliantutils/hpssa/objects.py b/proliantutils/hpssa/objects.py index 685485d..99ad977 100644 --- a/proliantutils/hpssa/objects.py +++ b/proliantutils/hpssa/objects.py @@ -15,8 +15,8 @@ import re import time -from oslo.concurrency import processutils -from oslo.utils import strutils +from oslo_concurrency import processutils +from oslo_utils import strutils from proliantutils import exception from proliantutils.hpssa import constants diff --git a/proliantutils/ipa_hw_manager/hardware_manager.py b/proliantutils/ipa_hw_manager/hardware_manager.py index 5229ade..f97f420 100644 --- a/proliantutils/ipa_hw_manager/hardware_manager.py +++ b/proliantutils/ipa_hw_manager/hardware_manager.py @@ -13,7 +13,7 @@ # under the License. from ironic_python_agent import hardware -from oslo.concurrency import processutils +from oslo_concurrency import processutils from proliantutils.hpssa import manager as hpssa_manager diff --git a/proliantutils/tests/hpssa/test_objects.py b/proliantutils/tests/hpssa/test_objects.py index 0c0c974..0bc271d 100644 --- a/proliantutils/tests/hpssa/test_objects.py +++ b/proliantutils/tests/hpssa/test_objects.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.concurrency import processutils +from oslo_concurrency import processutils import testtools from proliantutils import exception diff --git a/proliantutils/tests/ipa_hw_manager/__init__.py b/proliantutils/tests/ipa_hw_manager/__init__.py index 30faba5..b1d7e23 100644 --- a/proliantutils/tests/ipa_hw_manager/__init__.py +++ b/proliantutils/tests/ipa_hw_manager/__init__.py @@ -15,7 +15,7 @@ import sys import mock -from oslo.utils import importutils +from oslo_utils import importutils ironic_python_agent = importutils.try_import('ironic_python_agent') if not ironic_python_agent: diff --git a/proliantutils/tests/ipa_hw_manager/test_hardware_manager.py b/proliantutils/tests/ipa_hw_manager/test_hardware_manager.py index 0e821f5..43b5591 100644 --- a/proliantutils/tests/ipa_hw_manager/test_hardware_manager.py +++ b/proliantutils/tests/ipa_hw_manager/test_hardware_manager.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.concurrency import processutils +from oslo_concurrency import processutils import testtools from proliantutils.hpssa import manager as hpssa_manager diff --git a/requirements.txt b/requirements.txt index e50c556..ca607e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ six>=1.9.0 -oslo.concurrency>=1.4.1 # Apache-2.0 -oslo.utils>=1.2.0 +oslo.concurrency>=1.8.0 +oslo.utils>=1.4.0 jsonschema>=2.4.0 diff --git a/tox.ini b/tox.ini index 1a61776..c77ce07 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ envlist = py27,pep8,py34 [testenv] usedevelop = True -install_command = pip install -i http://pypi.gocept.com/simple/ -U {opts} {packages} +install_command = pip install -U {opts} {packages} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt