xlwings-utils 25.0.9__tar.gz → 25.0.10__tar.gz

{xlwings_utils-25.0.9 → xlwings_utils-25.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xlwings_utils
-Version: 25.0.9
+Version: 25.0.10
 Summary: xlwings_utils
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://github.com/salabim/xlwings_utils

{xlwings_utils-25.0.9 → xlwings_utils-25.0.10}/pyproject.toml

@@ -10,7 +10,7 @@ authors = [
     { name = "Ruud van der Ham", email = "rt.van.der.ham@gmail.com" },
 ]
 description = "xlwings_utils"
-version = "25.0.9"
+version = "25.0.10"
 readme = "README.md"
 requires-python = ">=3.9"
 dependencies = [

{xlwings_utils-25.0.9 → xlwings_utils-25.0.10}/tests/test_xlwings_utils.py

@@ -67,6 +67,39 @@ def test_block2():
     assert this_block.value == [[1, 2, 3, None], [4, 5, 6, None], [None, None, None, None]]
 
 
+def test_highest_used():
+    this_block = xwu.block(number_of_rows=4, number_of_columns=4)
+    assert this_block._highest_used_row_number is None
+    assert this_block.highest_used_row_number == 1
+    assert this_block.highest_used_column_number == 1
+    this_block[2, 3] = 1
+    assert this_block._highest_used_row_number is not None
+    assert this_block.highest_used_row_number == 2
+    assert this_block.highest_used_column_number == 3
+    this_block[1, 2] = 1
+    assert this_block._highest_used_row_number is not None
+    assert this_block.highest_used_row_number == 2
+    assert this_block.highest_used_column_number == 3
+    this_block[3, 4] = 1
+    assert this_block._highest_used_row_number is not None
+    assert this_block.highest_used_row_number == 3
+    assert this_block.highest_used_column_number == 4
+    this_block[3, 4] = None
+    assert this_block._highest_used_row_number is None
+    assert this_block.highest_used_row_number == 2
+    assert this_block.highest_used_column_number == 3
+    this_block[2, 3] = None
+    assert this_block._highest_used_row_number is None
+    this_block[2, 3] = 1
+    assert this_block._highest_used_row_number is None
+    this_block[2, 3] = None
+    this_block[1, 2] = None
+    assert this_block._highest_used_row_number is None
+    assert this_block.highest_used_row_number == 1
+    assert this_block.highest_used_column_number == 1
+    assert this_block._highest_used_row_number is not None
+
+
 def test_block_one_dimension():
     this_block = xwu.block.from_value([1, 2, 3])
     assert this_block.value == [[1, 2, 3]]
@@ -79,20 +112,23 @@ def test_block_scalar():
     this_block = xwu.block.from_value(1)
     assert this_block.value == [[1]]
 
+
 def test_transpose():
     this_block = xwu.block.from_value([[1, 2, 3], [4, 5, 6]])
-    transposed_block=this_block.transposed()
-    assert transposed_block.value==[[1,4],[2,5],[3,6]]
+    transposed_block = this_block.transposed()
+    assert transposed_block.value == [[1, 4], [2, 5], [3, 6]]
+
 
 def test_delete_none():
     this_block = xwu.block.from_value([[1, 2, None], [4, 5, None]])
-    assert len(this_block.dict)==4
-    this_block[1,1]=None
-    assert len(this_block.dict)==3    
-    this_block[1,1]=None
-    assert len(this_block.dict)==3 
-    assert this_block.value==[[None, 2, None], [4, 5, None]]
-    
+    assert len(this_block.dict) == 4
+    this_block[1, 1] = None
+    assert len(this_block.dict) == 3
+    this_block[1, 1] = None
+    assert len(this_block.dict) == 3
+    assert this_block.value == [[None, 2, None], [4, 5, None]]
+
+
 def test_raise():
     this_block = xwu.block(number_of_rows=4, number_of_columns=6)
     with pytest.raises(IndexError):
@@ -115,52 +151,55 @@ def test_raise():
     with pytest.raises(IndexError):
         this_block[1, 7] = 1
 
+
 def test_lookup():
-    bl=xwu.block.from_value([[1,"One", "Un"],[2, "Two", "Deux"],[3,"Three","Trois"]])
-    assert bl.lookup(1)=="One"
-    assert bl.lookup(3, column2=3)=="Trois"
+    bl = xwu.block.from_value([[1, "One", "Un"], [2, "Two", "Deux"], [3, "Three", "Trois"]])
+    assert bl.lookup(1) == "One"
+    assert bl.lookup(3, column2=3) == "Trois"
     with pytest.raises(ValueError):
         bl.lookup(4)
-    assert bl.lookup(4,default='x')=='x'        
+    assert bl.lookup(4, default="x") == "x"
     with pytest.raises(ValueError):
         bl.lookup(1, column1=4)
     with pytest.raises(ValueError):
         bl.lookup(1, column1=3)
-    assert bl.lookup_row(1)==1
-    assert bl.lookup_row(3)==3
+    assert bl.lookup_row(1) == 1
+    assert bl.lookup_row(3) == 3
+
 
 def test_vookup():
-    bl=xwu.block.from_value([[1,"One", "Un"],[2, "Two", "Deux"],[3,"Three","Trois"]])
-    assert bl.vlookup(1)=="One"
-    assert bl.vlookup(3, column2=3)=="Trois"
+    bl = xwu.block.from_value([[1, "One", "Un"], [2, "Two", "Deux"], [3, "Three", "Trois"]])
+    assert bl.vlookup(1) == "One"
+    assert bl.vlookup(3, column2=3) == "Trois"
     with pytest.raises(ValueError):
         bl.vlookup(4)
-    assert bl.vlookup(4, default='x')=='x'
+    assert bl.vlookup(4, default="x") == "x"
     with pytest.raises(ValueError):
         bl.vlookup(1, column1=4)
     with pytest.raises(ValueError):
         bl.vlookup(1, column1=3)
 
+
 def test_hlookup():
-    bl=xwu.block.from_value([[1,2,3],"One Two Three".split(), "Un Deux Trois".split()])
-                 
-    assert bl.hlookup(1)=="One"
-    assert bl.hlookup(3, row2=3)=="Trois"
+    bl = xwu.block.from_value([[1, 2, 3], "One Two Three".split(), "Un Deux Trois".split()])
+
+    assert bl.hlookup(1) == "One"
+    assert bl.hlookup(3, row2=3) == "Trois"
     with pytest.raises(ValueError):
         bl.hlookup(4)
-    assert bl.hlookup(4,default='x')=='x'
+    assert bl.hlookup(4, default="x") == "x"
     with pytest.raises(ValueError):
         bl.hlookup(1, row1=4)
     with pytest.raises(ValueError):
         bl.hlookup(1, row1=3)
-    assert bl.lookup_column(1)==1
-    assert bl.lookup_column(3)==3
+    assert bl.lookup_column(1) == 1
+    assert bl.lookup_column(3) == 3
 
 
 def test_capture(capsys):
     print("abc")
     print("def")
-    capture=xwu.Capture()
+    capture = xwu.Capture()
     out, err = capsys.readouterr()
     assert out == "abc\ndef\n"
     assert capture.str_keep == ""
@@ -172,10 +211,10 @@ def test_capture(capsys):
     out, err = capsys.readouterr()
     assert out == ""
     assert capture.str_keep == "abc\ndef\n"
-    assert capture.value_keep == [['abc'], ['def']]
+    assert capture.value_keep == [["abc"], ["def"]]
     assert capture.str == "abc\ndef\n"
     assert capture.value == []
-        
+
     with capture:
         print("abc")
         print("def")
@@ -188,28 +227,27 @@ def test_capture(capsys):
         print("def")
     with capture:
         print("ghi")
-        print("jkl")        
+        print("jkl")
     out, err = capsys.readouterr()
     assert out == ""
-    assert capture.str_keep == "abc\ndef\nghi\njkl\n"        
-    assert capture.value_keep == [['abc'], ['def'], ['ghi'], ['jkl']]
-    assert capture.value == [['abc'], ['def'], ['ghi'], ['jkl']]    
+    assert capture.str_keep == "abc\ndef\nghi\njkl\n"
+    assert capture.value_keep == [["abc"], ["def"], ["ghi"], ["jkl"]]
+    assert capture.value == [["abc"], ["def"], ["ghi"], ["jkl"]]
     assert capture.value == []
-    
-    capture.enabled=True
+
+    capture.enabled = True
     print("abc")
-    print("def")    
-    capture.enabled=False
+    print("def")
+    capture.enabled = False
     print("xxx")
-    print("yyy")          
-    capture.enabled=True
+    print("yyy")
+    capture.enabled = True
     print("ghi")
-    print("jkl")        
-    assert capture.str_keep == "abc\ndef\nghi\njkl\n"      
+    print("jkl")
+    assert capture.str_keep == "abc\ndef\nghi\njkl\n"
+
+    # include_print is not testable with pytest
+
 
-    
-        # include_print is not testable with pytest
-    
 if __name__ == "__main__":
     pytest.main(["-vv", "-s", "-x", __file__])
-

{xlwings_utils-25.0.9 → xlwings_utils-25.0.10}/xlwings_utils/xlwings_utils.py

@@ -5,7 +5,7 @@
 #  /_/\_\|_|  \_/\_/  |_||_| |_| \__, ||___/ _____  \__,_| \__||_||_||___/
 #                                |___/      |_____|
 
-__version__ = "25.0.9"
+__version__ = "25.0.10"
 
 
 import dropbox
@@ -278,6 +278,8 @@ class block:
         self.dict = {}
         self.number_of_rows = number_of_rows
         self.number_of_columns = number_of_columns
+        self._highest_used_row_number = None
+        self._highest_used_column_number = None
 
     def __eq__(self, other):
         if isinstance(other, block):
@@ -460,8 +462,14 @@ class block:
         if value is None:
             if (row, column) in self.dict:
                 del self.dict[row, column]
+                self._highest_used_row_number = None  # invalidate cached value
+                self._highest_used_column_number = None  # invalidate cached value
         else:
             self.dict[row, column] = value
+            if self._highest_used_row_number:
+                self._highest_used_row_number = max(self._highest_used_row_number, row)
+            if self._highest_used_column_number:
+                self._highest_used_column_number = max(self._highest_used_column_number, column)
 
     def __getitem__(self, row_column):
         row, column = row_column
@@ -488,6 +496,7 @@ class block:
     def number_of_rows(self, value):
         if value < 1:
             raise ValueError(f"number_of_rows should be >=1, not {value}")
+        self._highest_used_row_number = None
         self._number_of_rows = value
         for row, column in list(self.dict):
             if row > self._number_of_rows:
@@ -501,6 +510,7 @@ class block:
     def number_of_columns(self, value):
         if value < 1:
             raise ValueError(f"number_of_columns should be >=1, not {value}")
+        self._highest_used_column_number = None
         self._number_of_columns = value
         for row, column in list(self.dict):
             if column > self._number_of_columns:
@@ -508,17 +518,22 @@ class block:
 
     @property
     def highest_used_row_number(self):
-        if self.dict:
-            return max(row for (row, column) in self.dict)
-        else:
-            return 1
+        if not self._highest_used_row_number:
+            if self.dict:
+                self._highest_used_row_number = max(row for (row, column) in self.dict)
+            else:
+                self._highest_used_row_number = 1
+        return self._highest_used_row_number
 
     @property
     def highest_used_column_number(self):
-        if self.dict:
-            return max(column for (row, column) in self.dict)
-        else:
-            return 1
+        if not self._highest_used_column_number:
+            if self.dict:
+                self._highest_used_column_number = max(column for (row, column) in self.dict)
+            else:
+                self._highest_used_column_number = 1
+
+        return self._highest_used_column_number
 
     def __repr__(self):
         return f"block({self.value})"

{xlwings_utils-25.0.9 → xlwings_utils-25.0.10}/xlwings_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xlwings_utils
-Version: 25.0.9
+Version: 25.0.10
 Summary: xlwings_utils
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://github.com/salabim/xlwings_utils