From b6e09fff60ece3aec340d0b9782d2bdc63220608 Mon Sep 17 00:00:00 2001 From: Joe Keen Date: Thu, 10 Dec 2015 15:41:04 -0700 Subject: [PATCH] Adding liberty versions of oslo to requirements.txt Adjusting tox so I can properly restrict the oslo libraries before installing the python-keystoneclient Change-Id: I7e99ca78d8fde326d2d97b55a790a6c9f911bc70 --- requirements.txt | 14 +++++++++++--- tox.ini | 1 - 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2e33bfa..87d71a5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,18 @@ +oslo.config<2.5.0 +oslo.i18n<=2.6.0 +oslo.log<1.12.0 +oslo.middleware<2.9.0 +oslo.serialization<1.10.0 +oslo.service<1.0 +oslo.utils<2.6.0 + +python-keystoneclient<=1.7.2 + argparse babel iso8601>=0.1.9 -oslo.utils<2.0 pbr>=0.11,<2.0 PrettyTable>=0.7,<0.8 -python-keystoneclient==1.6.0 PyYAML>=3.1.0 -requests>=1.1 +requests>=1.1,<2.8 six>=1.7.0 diff --git a/tox.ini b/tox.ini index b17522e..4e4d518 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,6 @@ commands = python setup.py testr --slowest --testr-args='{posargs}' [testenv:pep8] commands = flake8 - {toxinidir}/tools/requirements_style_check.sh requirements.txt test-requirements.txt [testenv:venv] commands = {posargs}