From 479587c6d9f2fd519f1ea4c7fab3cbf2da1a92f4 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Mon, 7 Dec 2015 12:43:14 -0800
Subject: [PATCH] Revert "Move netifaces to extras"

For now revert this, at a later date we can reapply
this but we need to order this a little differently to
make it work out.

This reverts commit 2abbe1c3b19490f570c29502cd56ec92daf4ca45.

Change-Id: I20f3c5804caf1af698aa0f6397a9953eb9aba829
---
 requirements.txt | 1 +
 setup.cfg        | 4 ----
 tox.ini          | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 12d6123b..ed3f76ad 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,4 +14,5 @@ oslo.i18n>=1.5.0 # Apache-2.0
 monotonic>=0.3 # Apache-2.0
 pytz>=2013.6
 netaddr!=0.7.16,>=0.7.12
+netifaces>=0.10.4
 debtcollector>=0.3.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index cfa7389f..69305396 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,10 +22,6 @@ classifier =
 packages =
     oslo_utils
 
-[extras]
-netifaces =
-  netifaces>=0.10.4
-
 [pbr]
 warnerrors = true
 
diff --git a/tox.ini b/tox.ini
index 24284a1c..b94b3213 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,6 @@ envlist = py34,py27,pep8,bandit
 
 [testenv]
 deps = -r{toxinidir}/test-requirements.txt
-       .[netifaces]
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:pep8]