toolsos 0.3.2__tar.gz → 0.3.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toolsos
-Version: 0.3.2
+Version: 0.3.3
 Summary: OS tools
 Author-email: OS <d.schmitz@amsterdam.nl>
 Keywords: tools,Onderzoek & Statistiek

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

@@ -1,12 +1,12 @@
 # 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.3.3"
 description = "OS tools"
 readme = "README.md"
 authors = [{ name = "OS", email = "d.schmitz@amsterdam.nl" }]
@@ -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.3.2 → toolsos-0.3.3}/src/toolsos/huisstijl/tables/tables.py

@@ -733,7 +733,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)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toolsos
-Version: 0.3.2
+Version: 0.3.3
 Summary: OS tools
 Author-email: OS <d.schmitz@amsterdam.nl>
 Keywords: tools,Onderzoek & Statistiek

{toolsos-0.3.2 → toolsos-0.3.3}/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/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])