From 85bbc7da14f3ff99e7e0b0fd482e8cbea063a7fd Mon Sep 17 00:00:00 2001
From: Phoenix Zerin <phx@phx.ph>
Date: Wed, 16 Aug 2017 18:43:57 +1200
Subject: [PATCH] Universal wheels again (:

---
 .travis.yml |  1 +
 setup.cfg   |  2 ++
 setup.py    | 45 ++++++++++++++-------------------------------
 3 files changed, 17 insertions(+), 31 deletions(-)
 create mode 100644 setup.cfg

diff --git a/.travis.yml b/.travis.yml
index c28a210..012f3ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: trusty
 language: python
 python:
   - '2.7'
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..2a9acf1
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1
diff --git a/setup.py b/setup.py
index 250379d..a19bf55 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,6 @@
 from __future__ import absolute_import, division, print_function
 
 from codecs import StreamReader, open
-from sys import version_info
 
 from setuptools import find_packages, setup
 
@@ -15,34 +14,6 @@
   long_description = f.read()
 
 
-##
-# For compatibility with versions of pip < 9, we will determine
-# dependencies at runtime.
-# Maybe once Travis upgrades their containers to use a newer version,
-# we'll switch to the newer syntax (:
-install_dependencies = [
-  'filters',
-  'six',
-
-  # ``security`` extra wasn't introduced until 2.4.1
-  # http://docs.python-requests.org/en/latest/community/updates/#id35
-  'requests[security] >= 2.4.1',
-]
-
-unit_test_dependencies = [
-    'nose',
-  ]
-
-if version_info[0] < 3:
-  install_dependencies.extend([
-    'typing',
-  ])
-
-  unit_test_dependencies.extend([
-    'mock', # 'mock; python_version < "3.0"',
-  ])
-
-
 ##
 # Off we go!
 setup(
@@ -68,7 +39,16 @@
     ],
   },
 
-  install_requires = install_dependencies,
+  install_requires = [
+    'filters',
+    'six',
+
+    # ``security`` extra wasn't introduced until 2.4.1
+    # http://docs.python-requests.org/en/latest/community/updates/#id35
+    'requests[security] >= 2.4.1',
+
+    'typing; python_version < "3.0"',
+  ],
 
   extras_require = {
     'ccurl': ['pyota-ccurl'],
@@ -76,7 +56,10 @@
 
   test_suite    = 'test',
   test_loader   = 'nose.loader:TestLoader',
-  tests_require = unit_test_dependencies,
+  tests_require = [
+    'mock; python_version < "3.0"',
+    'nose',
+  ],
 
   license = 'MIT',