Merge pull request #115 from hhslepicka/mnt/remove-numpy-lock

Author: hhslepicka

botcity/web/browsers/chrome.py

@@ -132,9 +132,11 @@ def wait_for_downloads(driver):
     """
     if not driver.current_url.startswith("chrome://downloads"):
         driver.get("chrome://downloads/")
+    # Chrome changed the `e.state` from a ENUM Str to numbers. Here 2 means COMPLETE.
+    # Reference: https://shorturl.at/G4EES
     return driver.execute_script("""
         var items = document.querySelector('downloads-manager')
             .shadowRoot.getElementById('downloadsList').items;
-        if (items.every(e => e.state === "COMPLETE"))
+        if (items.every(e => e.state === 2))
             return items.map(e => e.fileUrl || e.file_url);
         """)

botcity/web/browsers/undetected_chrome.py

@@ -138,9 +138,11 @@ def wait_for_downloads(driver):
     """
     if not driver.current_url.startswith("chrome://downloads"):
         driver.get("chrome://downloads/")
+    # Chrome changed the `e.state` from a ENUM Str to numbers. Here 2 means COMPLETE.
+    # Reference: https://shorturl.at/G4EES
     return driver.execute_script("""
         var items = document.querySelector('downloads-manager')
             .shadowRoot.getElementById('downloadsList').items;
-        if (items.every(e => e.state === "COMPLETE"))
+        if (items.every(e => e.state === 2))
             return items.map(e => e.fileUrl || e.file_url);
         """)

botcity/web/tests/__init__.py

@@ -1,8 +1,8 @@
 botcity-framework-base>=0.2.2
 beautifulsoup4
-numpy<2
+numpy
 opencv-python
 pillow
 selenium>=4.10,<5
 undetected-chromedriver
-packaging
+packaging

botcity/web/tests/test_import.py

@@ -215,7 +215,7 @@ def test_get_view_port_size(web: WebBot):
         element = [width, height]
     else:
         element = web.find_element('window-size', By.ID).text.split('x')
-    sizes = [tuple(int(e) for e in element), (1600, 900), (1176, 802)]
+    sizes = [tuple(int(e) for e in element), (1600, 900), (1176, 802), (1600, 987)]
     assert size in sizes