Merge branch 'develop' into import_export

# Conflicts:
#	tablib/core.py
#	tablib/formats/_csv.py
#	tablib/formats/_xlsx.py

1 files changed, 30 insertions, 19 deletions

diff --git a/setup.py b/setup.py
index a6eeb1e..e3522fa 100755
--- a/setup.py
+++ b/setup.py
@@ -36,37 +36,48 @@ if sys.argv[-1] == 'test':
     errors = os.system('py.test test_tablib.py')
     sys.exit(bool(errors))
 
-setup(
-    name='tablib',
-    version=tablib.__version__,
-    description='Format agnostic tabular data library (XLS, JSON, YAML, CSV)',
-    long_description=(open('README.rst').read() + '\n\n' +
-        open('HISTORY.rst').read()),
-    author='Kenneth Reitz',
-    author_email='me@kennethreitz.org',
-    url='http://python-tablib.org',
-    packages=[
-        'tablib', 'tablib.formats',
-        'tablib.packages',
+packages = [
+    'tablib', 'tablib.formats',
+    'tablib.packages',
+    'tablib.packages.omnijson',
+    'tablib.packages.unicodecsv'
+]
+if sys.version_info[0] == 2:
+    packages.extend([
         'tablib.packages.xlwt',
-        'tablib.packages.xlwt3',
         'tablib.packages.xlrd',
-        'tablib.packages.xlrd3',
-        'tablib.packages.omnijson',
         'tablib.packages.odf',
-        'tablib.packages.odf3',
         '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.yaml',
         'tablib.packages.yaml3',
-        'tablib.packages.unicodecsv'
-    ],
+        'tablib.packages.dbfpy3'
+    ])
+
+
+setup(
+    name='tablib',
+    version=tablib.__version__,
+    description='Format agnostic tabular data library (XLS, JSON, YAML, CSV)',
+    long_description=(open('README.rst').read() + '\n\n' +
+        open('HISTORY.rst').read()),
+    author='Kenneth Reitz',
+    author_email='me@kennethreitz.org',
+    url='http://python-tablib.org',
+    packages=packages,
     license='MIT',
     classifiers=(
         'Development Status :: 5 - Production/Stable',