v0.11.1, fix packaging errorv0.11.1

4 files changed, 30 insertions, 28 deletions

diff --git a/HISTORY.rst b/HISTORY.rst
index fdc3b9c..2a74bb6 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,14 @@
 History
 -------
 
+0.11.1 (2016-02-07)
++++++++++++++++++++
+
+**Bugfixes**
+
+- Fixed packaging error on Python 3.
+
+
 0.11.0 (2016-02-07)
 +++++++++++++++++++
 
diff --git a/Makefile b/Makefile
index ef81323..35470bd 100644
--- a/Makefile
+++ b/Makefile
@@ -3,4 +3,4 @@ test:
 publish:
 	python setup.py register
 	python setup.py sdist upload
-	python setup.py bdist_wheel upload --universal
+	python setup.py bdist_wheel --universal upload
diff --git a/setup.py b/setup.py
index e3522fa..56a8f6b 100755
--- a/setup.py
+++ b/setup.py
@@ -40,32 +40,26 @@ packages = [
     'tablib', 'tablib.formats',
     'tablib.packages',
     'tablib.packages.omnijson',
-    'tablib.packages.unicodecsv'
+    'tablib.packages.unicodecsv',
+    'tablib.packages.xlwt',
+    'tablib.packages.xlrd',
+    'tablib.packages.odf',
+    'tablib.packages.openpyxl',
+    'tablib.packages.openpyxl.shared',
+    'tablib.packages.openpyxl.reader',
+    'tablib.packages.openpyxl.writer',
+    'tablib.packages.yaml',
+    'tablib.packages.dbfpy',
+    'tablib.packages.xlwt3',
+    'tablib.packages.xlrd3',
+    'tablib.packages.odf3',
+    'tablib.packages.openpyxl3',
+    'tablib.packages.openpyxl3.shared',
+    'tablib.packages.openpyxl3.reader',
+    'tablib.packages.openpyxl3.writer',
+    'tablib.packages.yaml3',
+    'tablib.packages.dbfpy3'
 ]
-if sys.version_info[0] == 2:
-    packages.extend([
-        'tablib.packages.xlwt',
-        'tablib.packages.xlrd',
-        'tablib.packages.odf',
-        'tablib.packages.openpyxl',
-        'tablib.packages.openpyxl.shared',
-        'tablib.packages.openpyxl.reader',
-        'tablib.packages.openpyxl.writer',
-        'tablib.packages.yaml',
-        'tablib.packages.dbfpy'
-    ])
-else:
-    packages.extend([
-        'tablib.packages.xlwt3',
-        'tablib.packages.xlrd3',
-        'tablib.packages.odf3',
-        'tablib.packages.openpyxl3',
-        'tablib.packages.openpyxl3.shared',
-        'tablib.packages.openpyxl3.reader',
-        'tablib.packages.openpyxl3.writer',
-        'tablib.packages.yaml3',
-        'tablib.packages.dbfpy3'
-    ])
 
 
 setup(
diff --git a/tablib/core.py b/tablib/core.py
index 08b2e31..5b23cb5 100644
--- a/tablib/core.py
+++ b/tablib/core.py
@@ -18,8 +18,8 @@ from tablib.compat import OrderedDict, unicode
 
 
 __title__ = 'tablib'
-__version__ = '0.11.0'
-__build__ = 0x001100
+__version__ = '0.11.1'
+__build__ = 0x001101
 __author__ = 'Kenneth Reitz'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2016 Kenneth Reitz'