toolsos 0.3.2__tar.gz → 0.4.0__tar.gz

{toolsos-0.3.2 → toolsos-0.4.0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: toolsos
-Version: 0.3.2
+Version: 0.4.0
 Summary: OS tools
-Author-email: OS <d.schmitz@amsterdam.nl>
+Author-email: Daan Schmitz <d.schmitz@amsterdam.nl>
 Keywords: tools,Onderzoek & Statistiek
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python

{toolsos-0.3.2 → toolsos-0.4.0}/pyproject.toml

@@ -1,15 +1,15 @@
 # pyproject.toml
 
 [build-system]
-requires      = ["setuptools>=61.0.0", "wheel"]
+requires = ["setuptools>=61.0.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "toolsos"
-version = "0.3.2"
+version = "0.4.0"
 description = "OS tools"
 readme = "README.md"
-authors = [{ name = "OS", email = "d.schmitz@amsterdam.nl" }]
+authors = [{ name = "Daan Schmitz", email = "d.schmitz@amsterdam.nl" }]
 
 # license = { file = "LICENSE" }
 
@@ -28,17 +28,11 @@ dependencies = []
 requires-python = ">=3.10"
 
 [project.optional-dependencies]
-dev = [
-    "black",
-    "bumpver",
-    "isort",
-    "pip-tools",
-    "pytest"
-    ]
+dev = ["black", "bumpver", "isort", "pip-tools", "pytest"]
 
 all = [
     "keyring",
-    "openpyxl", 
+    "openpyxl",
     "pandas",
     "plotly",
     "polars",
@@ -48,8 +42,8 @@ all = [
     "requests",
     "sqlalchemy",
     "geopandas",
-    "ipykernel"
-    ]
+    "ipykernel",
+]
 
 # [project.urls]
 #Homepage = ""

toolsos-0.4.0/src/toolsos/huisstijl/tables/table_helpers.py

@@ -0,0 +1,76 @@
+# from pathlib import Path
+
+# import pandas as pd
+# import win32com.client as win32
+
+
+# def remove_underscores_from_columns(df: pd.DataFrame) -> pd.DataFrame:
+#     df.columns = df.columns.str.replace("_", " ")
+#     return df
+
+
+# def get_excel_files_from_folder(folder: str) -> list[str]:
+#     return [str(f.resolve()) for f in Path(folder).glob("*") if f.suffix == ".xlsx"]
+
+
+# def combine_excel_files(out_path: str, files: list[str] = None, overwrite: bool = True):
+#     out_path = Path(out_path)
+
+#     if overwrite:
+#         if out_path.exists():
+#             out_path.unlink()
+
+#     # INITIALIZE EXCEL COM APP
+#     try:
+#         xlapp = win32.gencache.EnsureDispatch("Excel.Application")
+
+#         # constants
+#         xlPasteValues = -4163
+#         lPasteFormats = -4122
+#         xlWorkbookDefault = 51
+
+#         # create new workbook
+#         new_wb = xlapp.Workbooks.Add()
+#         new_wb.SaveAs(Filename=str(out_path), FileFormat=xlWorkbookDefault)
+
+#         dup_count = 1
+
+#         for wb in files:
+#             xlwb = xlapp.Workbooks.Open(wb)
+
+#             for xlsh in xlwb.Worksheets:
+#                 new_sh = new_wb.Worksheets.Add()
+
+#                 try:
+#                     new_sh.Name = xlsh.Name
+
+#                 # Ugly non defined exception. Be aware that this wil caputre
+#                 except Exception as e:
+#                     new_sh.Name = f"{xlsh.Name}_{dup_count}"
+#                     dup_count += 1
+
+#                 new_wb.Save()
+#                 new_sh.Move(After=new_wb.Worksheets(new_wb.Worksheets.Count))
+
+#                 xlsh.Cells.Copy(new_sh.Cells)
+#                 new_sh = None
+
+#             xlwb.Close(True)
+#             xlwb = None
+
+#         # remove default blad1
+#         new_wb.Worksheets("Blad1").Delete()
+#         new_wb.Save()
+
+#     except Exception as e:
+#         print(e)
+
+#     # RELEASE RESOURCES
+#     finally:
+#         xlsh = None
+#         new_sh = None
+#         xlwb = None
+#         new_wb = None
+#         xlapp.Quit()
+#         xlapp = None
+#         xlwb = None

{toolsos-0.3.2 → toolsos-0.4.0}/src/toolsos/huisstijl/tables/table_styles.py

@@ -7,13 +7,20 @@ STYLE_OLD = {
         "fill": {"fill_type": "solid", "fgColor": "B1D9F5"},
         "font": {"bold": False},
     },
-    "calibri": {"font": {"name": "Calibri", "size": 9}},
+    "calibri": {
+        "font": {"name": "Calibri", "size": 9},
+        # "alignment": {"vertical": "center"},
+    },
     "blue_border_bottom": {
         "border_bottom": {"color": "00a0e6", "border_style": "medium"}
     },
     "left_align": {"alignment": {"horizontal": "left"}, "font": {"bold": False}},
     "right_align": {"alignment": {"horizontal": "right"}},
-    "title_bold": {"font": {"bold": True, "name": "Calibri", "size": 9}},
+    "title_bold": {
+        "font": {"bold": True, "name": "Calibri", "size": 9},
+        "alignment": {"vertical": "center"},
+    },
+    "vert_align_middle": {"alignment": {"vertical": "center"}},
 }
 
 STYLE_NEW = {
@@ -25,11 +32,18 @@ STYLE_NEW = {
         "fill": {"fill_type": "solid", "fgColor": "b8bcdd"},
         "font": {"bold": True},
     },
-    "calibri": {"font": {"name": "Calibri", "size": 9}},
+    "calibri": {
+        "font": {"name": "Calibri", "size": 9},
+        "alignment": {"vertical": "center"},
+    },
     "blue_border_bottom": {
         "border_bottom": {"color": "004699", "border_style": "medium"}
     },
     "left_align": {"alignment": {"horizontal": "left"}, "font": {"bold": True}},
     "right_align": {"alignment": {"horizontal": "right"}},
-    "title_bold": {"font": {"bold": True, "name": "Calibri", "size": 9}},
+    "title_bold": {
+        "font": {"bold": True, "name": "Calibri", "size": 9},
+        # "alignment": {"vertical": "center"},
+    },
+    "vert_align_middle": {"alignment": {"vertical": "center"}},
 }

{toolsos-0.3.2 → toolsos-0.4.0}/src/toolsos/huisstijl/tables/tables.py

@@ -322,6 +322,7 @@ def cell_formatting(
     float_col_format: str | None = None,
     blue_border_ids: bool | None = None,
     number_format: str | None = None,
+    middle_vertical_aligment: list = None,
 ):
     """Function to create the nested list with the shape of the input data (including columns)
     containing dictionaries with the formatting
@@ -382,6 +383,9 @@ def cell_formatting(
     if blue_border_ids:
         fmt = set_style_row(fmt, blue_border_ids, STYLES["blue_border_bottom"])
 
+    if middle_vertical_aligment:
+        fmt = set_style_row(fmt, middle_vertical_aligment, STYLES["vert_align_middle"])
+
     return fmt
 
 
@@ -521,7 +525,7 @@ def write_table(
     column_widths: list[int] | None = None,
     min_column_width: int | None = None,
     col_filter: bool | None = False,
-    style: str = "old",
+    style: str = "new",
     combine_multiindex: bool | int = False,
     column_names_to_string: bool = True,
 ):
@@ -733,7 +737,7 @@ def format_worksheet(
         r_align_ids.extend(pr_id)
 
     if float_ids:
-        p_ids.extend(perc_ids)
+        f_ids.extend(float_ids)
 
     if float_pattern:
         fr_id = get_cols_id_with_pattern(df, float_pattern)
@@ -772,6 +776,11 @@ def format_worksheet(
     else:
         col_widths = None
 
+    # The top row of a table should be bottom aligned vertically. The rest of the table
+    # should vertically be aligned in the middle. If there is a title row the alignment
+    # needs to be shifted on row
+    row_vert_middle = [i for i in range(1, arr.shape[0] + 1)]
+
     ws = wb.create_sheet(sheet_name)
 
     fmt = cell_formatting(
@@ -788,6 +797,7 @@ def format_worksheet(
         float_col_format=float_col_format,
         number_format=number_format,
         blue_border_ids=blue_border_ids,
+        middle_vertical_aligment=row_vert_middle,
     )
 
     write_to_worksheet(

{toolsos-0.3.2 → toolsos-0.4.0}/src/toolsos.egg-info/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: toolsos
-Version: 0.3.2
+Version: 0.4.0
 Summary: OS tools
-Author-email: OS <d.schmitz@amsterdam.nl>
+Author-email: Daan Schmitz <d.schmitz@amsterdam.nl>
 Keywords: tools,Onderzoek & Statistiek
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python

{toolsos-0.3.2 → toolsos-0.4.0}/src/toolsos.egg-info/SOURCES.txt

@@ -27,5 +27,4 @@ src/toolsos/huisstijl/maps/choropleth.py
 src/toolsos/huisstijl/tables/__init__.py
 src/toolsos/huisstijl/tables/table_helpers.py
 src/toolsos/huisstijl/tables/table_styles.py
-src/toolsos/huisstijl/tables/tables.py
-tests/test_tables.py
+src/toolsos/huisstijl/tables/tables.py

toolsos-0.3.2/src/toolsos/huisstijl/tables/table_helpers.py

@@ -1,76 +0,0 @@
-from pathlib import Path
-
-import pandas as pd
-import win32com.client as win32
-
-
-def remove_underscores_from_columns(df: pd.DataFrame) -> pd.DataFrame:
-    df.columns = df.columns.str.replace("_", " ")
-    return df
-
-
-def get_excel_files_from_folder(folder: str) -> list[str]:
-    return [str(f.resolve()) for f in Path(folder).glob("*") if f.suffix == ".xlsx"]
-
-
-def combine_excel_files(out_path: str, files: list[str] = None, overwrite: bool = True):
-    out_path = Path(out_path)
-
-    if overwrite:
-        if out_path.exists():
-            out_path.unlink()
-
-    # INITIALIZE EXCEL COM APP
-    try:
-        xlapp = win32.gencache.EnsureDispatch("Excel.Application")
-
-        # constants
-        xlPasteValues = -4163
-        lPasteFormats = -4122
-        xlWorkbookDefault = 51
-
-        # create new workbook
-        new_wb = xlapp.Workbooks.Add()
-        new_wb.SaveAs(Filename=str(out_path), FileFormat=xlWorkbookDefault)
-
-        dup_count = 1
-
-        for wb in files:
-            xlwb = xlapp.Workbooks.Open(wb)
-
-            for xlsh in xlwb.Worksheets:
-                new_sh = new_wb.Worksheets.Add()
-
-                try:
-                    new_sh.Name = xlsh.Name
-
-                # Ugly non defined exception. Be aware that this wil caputre
-                except Exception as e:
-                    new_sh.Name = f"{xlsh.Name}_{dup_count}"
-                    dup_count += 1
-
-                new_wb.Save()
-                new_sh.Move(After=new_wb.Worksheets(new_wb.Worksheets.Count))
-
-                xlsh.Cells.Copy(new_sh.Cells)
-                new_sh = None
-
-            xlwb.Close(True)
-            xlwb = None
-
-        # remove default blad1
-        new_wb.Worksheets("Blad1").Delete()
-        new_wb.Save()
-
-    except Exception as e:
-        print(e)
-
-    # RELEASE RESOURCES
-    finally:
-        xlsh = None
-        new_sh = None
-        xlwb = None
-        new_wb = None
-        xlapp.Quit()
-        xlapp = None
-        xlwb = None

toolsos-0.3.2/tests/test_tables.py

@@ -1,56 +0,0 @@
-import openpyxl
-import pandas as pd
-import pytest
-
-from toolsos.huisstijl.tables.tables import write_table, write_table_from_dict
-
-DATA = [["Noord", 1, 0.25], ["Zuid", 3, 0.75]]
-
-
-COLUMNS = ["stadsdeel", "bewoners", "perc_bewoners"]
-
-
-@pytest.fixture(scope="class")
-def workbook(data=DATA, columns=COLUMNS):
-    df1 = pd.DataFrame(data=DATA, columns=COLUMNS)
-
-    filename = "temp/singe_table.xlsx"
-    write_table(
-        df1, file=filename, header_row=0, perc_pattern="perc_bewoners", style="new"
-    )
-    return openpyxl.load_workbook(filename)
-
-
-class TestTable:
-    @pytest.fixture(autouse=True)
-    def setup(self, workbook):
-        self.workbook = workbook
-        self.ws = workbook.active
-
-    def test_data(self, data=DATA):
-        rows = [[c.value for c in row] for row in self.ws.iter_rows(2)]
-
-        assert all(src == written for src, written in zip(DATA, rows))
-
-    def test_data_header(self):
-        header = [[c.value for c in row] for row in self.ws.iter_rows(2)]
-
-        assert all(src == written for src, written in zip(DATA, header))
-
-    def test_background_color_header(self):
-        header_color = [
-            [c.fill.fgColor.value for c in row] for row in self.ws.iter_rows(max_row=1)
-        ]
-
-        assert all([[c == "004699" for c in row] for row in header_color])
-
-    # def test_text_color_header(self):
-    #     header_text_color = [[c.font.color.value for in row] in self.ws]
-
-    def test_formatting(self):
-        perc_values = [
-            [c.number_format for c in row]
-            for row in self.ws.iter_rows(min_row=2, min_col=3)
-        ]
-
-        all([[c == "'0.0%'" for c in row] for row in perc_values])