From 792108f771607b75a25e9c4cfaaa26e5039d1748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dulko?= <michal.dulko@intel.com>
Date: Fri, 8 Jul 2016 12:21:41 +0200
Subject: [PATCH] Remove ovo[fixtures] dependency from tox.ini

Looks like we should now be able to add oslo.versionedobjects[fixtures]
to test-requirements.txt and remove it from tox.ini, so this commit does
that.

Change-Id: I420ea16d8ad6d883e7c2c8de80f912ea35500367
---
 test-requirements.txt | 1 +
 tox.ini               | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 5fb883b50ba..d796b05222e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -20,6 +20,7 @@ testrepository>=0.0.18 # Apache-2.0/BSD
 testresources>=0.2.4 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 oslosphinx>=4.7.0 # Apache-2.0
+oslo.versionedobjects[fixtures]>=1.13.0 # Apache-2.0
 os-testr>=0.7.0 # Apache-2.0
 tempest-lib>=0.14.0 # Apache-2.0
 bandit>=1.1.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index a92ec995017..b79c34eb761 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,10 +11,7 @@ setenv = VIRTUAL_ENV={envdir}
 usedevelop = True
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 
-# TODO(mriedem): Move oslo.versionedobjects[fixtures] to test-requirements.txt
-#                after I937823ffeb95725f0b55e298ebee1857d6482883 lands.
 deps = -r{toxinidir}/test-requirements.txt
-       oslo.versionedobjects[fixtures]
 
 # By default ostestr will set concurrency
 # to ncpu, to specify something else use