Merge "Fixes Windows setup dependency bug"

neutron/hooks.py

@@ -21,10 +21,11 @@ import sys
 def setup_hook(config):
     """Filter config parsed from a setup.cfg to inject our defaults."""
     metadata = config['metadata']
+    requires = metadata.get('requires_dist', '').split('\n')
     if sys.platform == 'win32':
-        requires = metadata.get('requires_dist', list()).split('\n')
         requires.append('pywin32')
         requires.append('wmi')
-        requires.remove('pyudev')
-        metadata['requires_dist'] = "\n".join(requires)
+    elif sys.platform.startswith('linux'):
+        requires.append('pyudev')
+    metadata['requires_dist'] = "\n".join(requires)
     config['metadata'] = metadata

requirements.txt

@@ -14,7 +14,6 @@ iso8601>=0.1.4
 kombu>=2.4.8
 netaddr
 python-neutronclient>=2.2.3,<3
-pyudev
 SQLAlchemy>=0.7.8,<=0.7.99
 WebOb>=1.2.3,<1.3
 python-keystoneclient>=0.3.0