Merge branch 'master' of github.com:gvlproject/cloudbridge

setup.cfg

@@ -14,3 +14,5 @@ match=^[Tt]est
 # Don't capture stdout - print immediately
 nocapture=1
 
+[bdist_wheel]
+universal = 1

setup.py

@@ -63,8 +63,7 @@ setup(
     url='http://cloudbridge.cloudve.org/',
     install_requires=REQS_FULL,
     extras_require={
-        ':python_version=="2.7"': ['py2-ipaddress'],
-        ':python_version=="3"': ['py2-ipaddress'],
+        ':python_version<"3.3"': ['ipaddress'],
         'full': REQS_FULL,
         'dev': REQS_DEV
     },