incorporate new test structure

Author: chris-b1

pandas/io/excel.py

@@ -281,7 +281,8 @@ def parse(self, sheetname=0, header=0, skiprows=None, skip_footer=0,
             warn("\nThe has_index_names argument is deprecated; index names "
                  "will be automatically inferred based on index_col.\n"
                  "This argmument is still necessary if reading Excel output "
-                 "from 0.16.2 or prior with index names.", FutureWarning)
+                 "from 0.16.2 or prior with index names.", FutureWarning,
+                 stacklevel=3)
 
         return self._parse_excel(sheetname=sheetname, header=header,
                                  skiprows=skiprows,

pandas/io/tests/data/test_index_name_pre17.xls

@@ -14,6 +14,7 @@
 import numpy as np
 from numpy.testing.decorators import slow
 
+import pandas as pd
 from pandas import DataFrame, Index, MultiIndex
 from pandas.io.parsers import read_csv
 from pandas.io.excel import (
@@ -416,7 +417,7 @@ def test_read_xlrd_Book(self):
     @tm.network
     def test_read_from_http_url(self):
         url = ('https://raw.github.com/pydata/pandas/master/'
-               'pandas/io/tests/data/test' + self.ext)
+               'pandas/io/tests/data/test1' + self.ext)
         url_table = read_excel(url)
         local_table = self.get_exceldf('test1')
         tm.assert_frame_equal(url_table, local_table)
@@ -517,56 +518,54 @@ def test_reader_seconds(self):
 
     def test_read_excel_multiindex(self):
         #GH 4679
-        _skip_if_no_xlrd()
         mi = MultiIndex.from_product([['foo','bar'],['a','b']])
-        for ext in ['.xls', '.xlsx']:
-            mi_file = os.path.join(self.dirpath, 'testmultiindex' + ext)
+        mi_file = os.path.join(self.dirpath, 'testmultiindex' + self.ext)
 
-            expected = DataFrame([[1, 2.5, pd.Timestamp('2015-01-01'), True],
-                                [2, 3.5, pd.Timestamp('2015-01-02'), False],
-                                [3, 4.5, pd.Timestamp('2015-01-03'), False],
-                                [4, 5.5, pd.Timestamp('2015-01-04'), True]],
-                                columns = mi)
+        expected = DataFrame([[1, 2.5, pd.Timestamp('2015-01-01'), True],
+                            [2, 3.5, pd.Timestamp('2015-01-02'), False],
+                            [3, 4.5, pd.Timestamp('2015-01-03'), False],
+                            [4, 5.5, pd.Timestamp('2015-01-04'), True]],
+                            columns = mi)
 
-            actual = read_excel(mi_file, 'mi_column', header=[0,1])
-            tm.assert_frame_equal(actual, expected)
-            actual = read_excel(mi_file, 'mi_column', header=[0,1], index_col=0)
-            tm.assert_frame_equal(actual, expected)
+        actual = read_excel(mi_file, 'mi_column', header=[0,1])
+        tm.assert_frame_equal(actual, expected)
+        actual = read_excel(mi_file, 'mi_column', header=[0,1], index_col=0)
+        tm.assert_frame_equal(actual, expected)
 
-            expected.columns = ['a', 'b', 'c', 'd']
-            expected.index = mi
-            actual = read_excel(mi_file, 'mi_index', index_col=[0,1])
-            tm.assert_frame_equal(actual, expected, check_names=False)
+        expected.columns = ['a', 'b', 'c', 'd']
+        expected.index = mi
+        actual = read_excel(mi_file, 'mi_index', index_col=[0,1])
+        tm.assert_frame_equal(actual, expected, check_names=False)
 
-            expected.columns = mi
-            actual = read_excel(mi_file, 'both', index_col=[0,1], header=[0,1])
-            tm.assert_frame_equal(actual, expected, check_names=False)
+        expected.columns = mi
+        actual = read_excel(mi_file, 'both', index_col=[0,1], header=[0,1])
+        tm.assert_frame_equal(actual, expected, check_names=False)
 
-            expected.index = mi.set_names(['ilvl1', 'ilvl2'])
-            expected.columns = ['a', 'b', 'c', 'd']
-            actual = read_excel(mi_file, 'mi_index_name', index_col=[0,1])
-            tm.assert_frame_equal(actual, expected)
+        expected.index = mi.set_names(['ilvl1', 'ilvl2'])
+        expected.columns = ['a', 'b', 'c', 'd']
+        actual = read_excel(mi_file, 'mi_index_name', index_col=[0,1])
+        tm.assert_frame_equal(actual, expected)
 
-            expected.index = list(range(4))
-            expected.columns = mi.set_names(['c1', 'c2'])
-            actual = read_excel(mi_file, 'mi_column_name', header=[0,1], index_col=0)
-            tm.assert_frame_equal(actual, expected)
+        expected.index = list(range(4))
+        expected.columns = mi.set_names(['c1', 'c2'])
+        actual = read_excel(mi_file, 'mi_column_name', header=[0,1], index_col=0)
+        tm.assert_frame_equal(actual, expected)
 
-            expected.index = mi.set_names(['ilvl1', 'ilvl2'])
-            actual = read_excel(mi_file, 'both_name', index_col=[0,1], header=[0,1])
-            tm.assert_frame_equal(actual, expected)
+        expected.index = mi.set_names(['ilvl1', 'ilvl2'])
+        actual = read_excel(mi_file, 'both_name', index_col=[0,1], header=[0,1])
+        tm.assert_frame_equal(actual, expected)
 
-            actual = read_excel(mi_file, 'both_name', index_col=[0,1], header=[0,1])
-            tm.assert_frame_equal(actual, expected)
+        actual = read_excel(mi_file, 'both_name', index_col=[0,1], header=[0,1])
+        tm.assert_frame_equal(actual, expected)
 
-            actual = read_excel(mi_file, 'both_name_skiprows', index_col=[0,1],
-                                header=[0,1],  skiprows=2)
-            tm.assert_frame_equal(actual, expected)
+        actual = read_excel(mi_file, 'both_name_skiprows', index_col=[0,1],
+                            header=[0,1],  skiprows=2)
+        tm.assert_frame_equal(actual, expected)
 
 
     def test_excel_multindex_roundtrip(self):
         #GH 4679
-        _skip_if_no_xlrd()
+        _skip_if_no_xlsxwriter()
         with ensure_clean('.xlsx') as pth:
             for c_idx_names in [True, False]:
                 for r_idx_names in [True, False]:
@@ -603,7 +602,6 @@ def test_excel_multindex_roundtrip(self):
 
     def test_excel_oldindex_format(self):
         #GH 4679
-        _skip_if_no_xlrd()
         data = np.array([['R0C0', 'R0C1', 'R0C2', 'R0C3', 'R0C4'],
                          ['R1C0', 'R1C1', 'R1C2', 'R1C3', 'R1C4'],
                          ['R2C0', 'R2C1', 'R2C2', 'R2C3', 'R2C4'],
@@ -616,7 +614,7 @@ def test_excel_oldindex_format(self):
                         names=['R0', 'R1'])
         si = Index(['R_l0_g0', 'R_l0_g1', 'R_l0_g2', 'R_l0_g3', 'R_l0_g4'],  name='R0')
 
-        in_file = os.path.join(self.dirpath, 'test_index_name_pre17.xlsx')
+        in_file = os.path.join(self.dirpath, 'test_index_name_pre17' + self.ext)
 
         expected = pd.DataFrame(data, index=si, columns=columns)
         with tm.assert_produces_warning(FutureWarning):