Merge branch 'devel'

Author: DeepSpace2

CHANGELOG.md

@@ -1,3 +1,6 @@
+#### 3.0.4
+* Fixed style "shifts" when using `read_style=True` and `header=None` with `StyleFrame.read_excel`. Fixes github issue #80 
+
 #### 3.0.3
 No longer relying on openpyxl's colors definition. Related to github issue #73
 

styleframe/style_frame.py

@@ -199,13 +199,20 @@ def _read_style():
                     col_index_in_excel += 1  # Move next to excel indices column
 
                 sf.columns[col_index].style = get_style_object(row=1, column=col_index_in_excel)
-                for row_index, sf_index in enumerate(sf.index, start=2):
+                for row_index, sf_index in enumerate(sf.index, start=start_row_index):
                     sf.at[sf_index, col_name].style = get_style_object(row=row_index, column=col_index_in_excel)
                     sf._rows_height[row_index] = sheet.row_dimensions[row_index].height
 
                 sf._columns_width[col_name] = sheet.column_dimensions[sf._get_column_as_letter(sheet, col_name)].width
 
         sheet_name = kwargs.pop('sheetname', sheet_name)
+        header_arg = kwargs.get('header', 0)
+        if read_style and isinstance(header_arg, Iterable):
+            raise ValueError('Not supporting multiple index columns with read style.')
+        if header_arg is None:
+            start_row_index = 1
+        else:
+            start_row_index = header_arg + 2
         index_col = kwargs.get('index_col')
         excel_index_col = index_col + 1 if index_col is not None else None
         if read_style and isinstance(excel_index_col, Iterable):

styleframe/tests/style_frame_tests.py

@@ -411,6 +411,22 @@ def test_read_excel_with_style_comments_styler_objects(self):
                             for row_in_excel, row_in_self in zip(rows_in_excel, rows_in_self)
                             for excel_cell, self_cell in zip(row_in_excel[1:], row_in_self[1:])))
 
+    def test_read_excel_with_style_header_arg_none(self):
+        self.sf = StyleFrame({0: ['A1', 'A2', 'A3', 'A4', 'A5']})
+        self.sf.apply_style_by_indexes(self.sf[self.sf.data_df[0].isin(('A2', 'A5'))], Styler(bold=True))
+        self.export_and_get_default_sheet(save=True)
+        sf_from_excel = StyleFrame.read_excel(TEST_FILENAME, read_style=True, header=None)
+        # making sure content is the same
+        self.assertTrue(all(list(self.sf[col]) == list(sf_from_excel[col])[1:] for col in self.sf.columns))
+
+        rows_in_excel = list(sf_from_excel.data_df.itertuples())
+        rows_in_self = self.sf.data_df.itertuples()
+
+        # making sure styles are the same
+        self.assertTrue(all(excel_cell.style == self_cell.style
+                            for row_in_excel, row_in_self in zip(rows_in_excel[1:], rows_in_self)
+                            for excel_cell, self_cell in zip(row_in_excel[1:], row_in_self[1:])))
+
     def test_read_excel_template_equal_boundaries(self):
         template_sf = StyleFrame(
                         obj={

styleframe/version.py

@@ -17,7 +17,7 @@ def get_all_versions():
     return _versions_
 
 
-_version_ = '3.0.3'
+_version_ = '3.0.4'
 _python_version_ = get_python_version()
 _pandas_version_ = get_pandas_version()
 _openpyxl_version_ = get_openpyxl_version()