Merge branch 'master' into v0.17.x

Jordan Adler · Jordan Adler · commit 0101e3d86177 · 2018-10-30T17:16:45.000-07:00
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,2 @@
-[bdist_wheel]
-universal = 1
-
 [metadata]
 license_file = LICENSE.txt
diff --git a/setup.py b/setup.py
@@ -12,6 +12,7 @@
 except ImportError:
     from distutils.core import setup
 
+
 if sys.argv[-1] == 'publish':
     os.system('python setup.py sdist upload')
     sys.exit()
