From d807c603466d05a2288f3bde8454f331084a6649 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Mon, 14 May 2012 17:14:46 -0700 Subject: Tweak setup.py for py.test (pytest?) --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 63b1d76..bde8621 100755 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ if sys.argv[-1] == 'test': print('py.test required.') sys.exit(1) - os.system('pytest test_tablib.py') + os.system('py.test test_tablib.py') sys.exit() setup( @@ -70,4 +70,5 @@ setup( 'Programming Language :: Python :: 3.1', 'Programming Language :: Python :: 3.2', ), + tests_require=['pytest'], ) -- cgit v1.2.1 From 6a449d497aa40e6c1aee2d3ce55fce680d1f0a47 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Mon, 14 May 2012 20:44:23 -0700 Subject: Add support for tox --- setup.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index bde8621..cd6e39c 100755 --- a/setup.py +++ b/setup.py @@ -49,6 +49,9 @@ setup( 'tablib', 'tablib.formats', 'tablib.packages', 'tablib.packages.xlwt', + 'tablib.packages.xlrd', + 'tablib.packages.omnijson', + 'tablib.packages.odf', 'tablib.packages.openpyxl', 'tablib.packages.openpyxl.shared', 'tablib.packages.openpyxl.reader', -- cgit v1.2.1 From a3781e3c896071e49d7cfbac7f24d3f0c5336be9 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Tue, 15 May 2012 07:19:15 -0700 Subject: Changes for Python 3 compatibility, including vendorizing xlrd3 --- setup.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index cd6e39c..6b4c603 100755 --- a/setup.py +++ b/setup.py @@ -49,13 +49,20 @@ setup( 'tablib', 'tablib.formats', 'tablib.packages', '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.openpyxl3', + 'tablib.packages.openpyxl3.shared', + 'tablib.packages.openpyxl3.reader', + 'tablib.packages.openpyxl3.writer', 'tablib.packages.yaml', 'tablib.packages.unicodecsv' ], -- cgit v1.2.1