Merge branch 'devel'

Author: DeepSpace2

CHANGELOG.md

@@ -1,3 +1,6 @@
+#### 3.0.5
+* Fixes github issue #81 - read excel as template headers height
+
 #### 3.0.4
 * Fixed style "shifts" when using `read_style=True` and `header=None` with `StyleFrame.read_excel`. Fixes github issue #80 
 

styleframe/style_frame.py

@@ -190,6 +190,11 @@ def _read_style():
                 raise TypeError("'sheet_name' must be a string or int, got {} instead".format(type(sheet_name)))
             theme_colors = _get_scheme_colors_from_excel(wb)
 
+            # Set the headers row height
+            if header_arg is not None:
+                headers_row_idx = header_arg + 1
+                sf._rows_height[headers_row_idx] = sheet.row_dimensions[headers_row_idx].height
+
             get_style_object = partial(_get_style_object, sheet=sheet, theme_colors=theme_colors)
             for col_index, col_name in enumerate(sf.columns):
                 col_index_in_excel = col_index + 1

styleframe/tests/style_frame_tests.py

@@ -427,6 +427,30 @@ def test_read_excel_with_style_header_arg_none(self):
                             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_rows_height(self):
+        self.sf.set_row_height(rows=1, height=25)
+        self.sf.set_row_height(rows=2, height=15)
+        self.export_and_get_default_sheet(save=True)
+        sf_from_excel = StyleFrame.read_excel(TEST_FILENAME, read_style=True)
+
+        # Assert the number of rows with height is the length of our data plus 1 for headers row
+        self.assertEqual(len(sf_from_excel._rows_height), len(self.sf) + 1)
+        self.assertEqual(sf_from_excel._rows_height[1], 25)
+        self.assertEqual(sf_from_excel._rows_height[2], 15)
+        self.assertEqual(sf_from_excel._rows_height[3], None)
+        self.assertEqual(sf_from_excel._rows_height[4], None)
+
+    def test_read_excel_columns_width(self):
+        self.sf.set_column_width(columns='a', width=25)
+        self.sf.set_column_width(columns='b', width=15)
+        self.export_and_get_default_sheet(save=True)
+        sf_from_excel = StyleFrame.read_excel(TEST_FILENAME, read_style=True)
+
+        # Assert the number of rows with height is the length of our data plus 1 for headers row
+        self.assertEqual(len(sf_from_excel._columns_width), len(self.sf.columns))
+        self.assertEqual(sf_from_excel._columns_width['a'], 25)
+        self.assertEqual(sf_from_excel._columns_width['b'], 15)
+
     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.4'
+_version_ = '3.0.5'
 _python_version_ = get_python_version()
 _pandas_version_ = get_pandas_version()
 _openpyxl_version_ = get_openpyxl_version()