Skip to content

Commit 03676e7

Browse files
author
James McKinney
committed
Use --no-inference in new tests to avoid XLSX conversion differences between Python 2 and 3
1 parent 0c3964e commit 03676e7

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
a,b,c
2-
True,2,3
2+
1,2,3

tests/test_utilities/test_csvsql.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,9 @@ def test_query(self):
134134
with stdin_as_string(input_file):
135135
sql = self.get_output(['--query', 'SELECT m.usda_id, avg(i.sepal_length) AS mean_sepal_length FROM iris AS i JOIN irismeta AS m ON (i.species = m.species) GROUP BY m.species', 'examples/iris.csv', 'examples/irismeta.csv'])
136136

137-
if six.PY2:
138-
self.assertTrue('usda_id,mean_sepal_length' in sql)
139-
self.assertTrue('IRSE,5.006' in sql)
140-
self.assertTrue('IRVE2,5.936' in sql)
141-
self.assertTrue('IRVI,6.588' in sql)
142-
else:
143-
self.assertTrue('usda_id,mean_sepal_length' in sql)
144-
self.assertTrue('IRSE,5.005' in sql)
145-
self.assertTrue('IRVE2,5.936' in sql)
146-
self.assertTrue('IRVI,6.587' in sql)
137+
self.assertTrue('usda_id,mean_sepal_length' in sql)
138+
self.assertTrue('IRSE,5.00' in sql)
139+
self.assertTrue('IRVE2,5.936' in sql)
140+
self.assertTrue('IRVI,6.58' in sql)
147141

148142
input_file.close()

tests/test_utilities/test_in2csv.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,12 @@ def test_convert_xls_with_write_sheets(self):
190190

191191
def test_convert_xlsx_with_write_sheets(self):
192192
try:
193-
self.assertConverted('xlsx', 'examples/sheets.xlsx', 'examples/testxlsx_converted.csv', ['--sheet', 'data', '--write-sheets', "ʤ,1"])
193+
self.assertConverted('xlsx', 'examples/sheets.xlsx', 'examples/testxlsx_noinference_converted.csv', ['--no-inference', '--sheet', 'data', '--write-sheets', "ʤ,1"])
194194
with open('examples/sheets_0.csv', 'r') as f:
195195
with open('examples/testxlsx_unicode_converted.csv', 'r') as g:
196196
self.assertEqual(f.read(), g.read())
197197
with open('examples/sheets_1.csv', 'r') as f:
198-
with open('examples/testxlsx_converted.csv', 'r') as g:
198+
with open('examples/testxlsx_noinference_converted.csv', 'r') as g:
199199
self.assertEqual(f.read(), g.read())
200200
self.assertFalse(os.path.exists('examples/sheets_2.csv'))
201201
finally:

0 commit comments

Comments
 (0)