Merge pull request #1410 from seleniumbase/reduce-python-dependencies

Reduce required Python dependencies

Author: mdmintz

requirements.txt

@@ -106,22 +106,12 @@ pymysql==0.10.1;python_version<"3.6"
 pymysql==1.0.2;python_version>="3.6"
 pyotp==2.3.0;python_version<"3.6"
 pyotp==2.6.0;python_version>="3.6"
-boto==2.49.0
 cffi==1.15.1
 toml==0.10.2
-Pillow==6.2.2;python_version<"3.6"
-Pillow==8.4.0;python_version>="3.6" and python_version<"3.7"
-Pillow==9.2.0;python_version>="3.7"
 typing-extensions==3.10.0.2;python_version<"3.6"
 typing-extensions==4.1.1;python_version>="3.6" and python_version<"3.7"
 typing-extensions==4.2.0;python_version>="3.7" and python_version<"3.9"
 rich==12.5.1;python_version>="3.6" and python_version<"4.0"
-tornado==5.1.1;python_version<"3.6"
-tornado==6.1;python_version>="3.6" and python_version<"3.7"
-tornado==6.2;python_version>="3.7"
-pdfminer.six==20191110;python_version<"3.6"
-pdfminer.six==20211012;python_version>="3.6" and python_version<"3.7"
-pdfminer.six==20220524;python_version>="3.7"
 
 # --- Testing Requirements --- #
 # ("pip install -r requirements.txt" also installs this, but "pip install -e ." won't.)

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "3.5.1"
+__version__ = "3.5.2"

seleniumbase/core/s3_manager.py

@@ -2,6 +2,7 @@
 Methods for uploading/managing files on Amazon S3.
 """
 from seleniumbase.config import settings
+from seleniumbase.fixtures import shared_utils
 
 already_uploaded_files = []
 
@@ -19,15 +20,23 @@ def __init__(
         selenium_access_key=settings.S3_SELENIUM_ACCESS_KEY,
         selenium_secret_key=settings.S3_SELENIUM_SECRET_KEY,
     ):
-        from boto.s3.connection import S3Connection
+        try:
+            from boto.s3.connection import S3Connection
+        except Exception:
+            shared_utils.pip_install("boto", version="2.49.0")
+            from boto.s3.connection import S3Connection
 
         self.conn = S3Connection(selenium_access_key, selenium_secret_key)
         self.bucket = self.conn.get_bucket(log_bucket)
         self.bucket_url = bucket_url
 
     def get_key(self, file_name):
         """Create a new Key instance with the given name."""
-        from boto.s3.key import Key
+        try:
+            from boto.s3.key import Key
+        except Exception:
+            shared_utils.pip_install("boto", version="2.49.0")
+            from boto.s3.key import Key
 
         return Key(bucket=self.bucket, name=file_name)
 

seleniumbase/fixtures/base_case.py

@@ -413,8 +413,13 @@ def click(
         else:
             # A smaller subset of self.wait_for_ready_state_complete()
             self.wait_for_angularjs(timeout=settings.MINI_TIMEOUT)
-            if self.driver.current_url != pre_action_url:
-                self.__ad_block_as_needed()
+            try:
+                if self.driver.current_url != pre_action_url:
+                    self.__ad_block_as_needed()
+            except Exception:
+                self.wait_for_ready_state_complete()
+                if self.driver.current_url != pre_action_url:
+                    self.__ad_block_as_needed()
         if self.browser == "safari":
             time.sleep(0.02)
         if self.demo_mode:
@@ -5493,7 +5498,12 @@ def get_pdf_text(
 
         with warnings.catch_warnings():
             warnings.simplefilter("ignore", category=UserWarning)
-            from pdfminer.high_level import extract_text
+            try:
+                from pdfminer.high_level import extract_text
+            except Exception:
+                shared_utils.pip_install("pdfminer.six")
+                from pdfminer.high_level import extract_text
+
         if not password:
             password = ""
         if not maxpages:
@@ -5718,7 +5728,11 @@ def save_element_as_image_file(
             file.write(element_png)
         # Add a text overlay if given
         if type(overlay_text) is str and len(overlay_text) > 0:
-            from PIL import Image, ImageDraw
+            try:
+                from PIL import Image, ImageDraw
+            except Exception:
+                shared_utils.pip_install("Pillow")
+                from PIL import Image, ImageDraw
 
             text_rows = overlay_text.split("\n")
             len_text_rows = len(text_rows)

seleniumbase/fixtures/constants.py

@@ -73,6 +73,10 @@ class Dashboard:
     DASH_PIE_PNG_3 = encoded_images.DASH_PIE_PNG_3  # Faster than CDN
 
 
+class PipInstall:
+    LOCKFILE = Files.DOWNLOADS_FOLDER + "/pipinstall.lock"
+
+
 class SideBySide:
     HTML_FILE = "side_by_side.html"
     SIDE_BY_SIDE_PNG = encoded_images.SIDE_BY_SIDE_PNG

seleniumbase/fixtures/shared_utils.py

@@ -1,6 +1,9 @@
 """
 This module contains shared utility methods.
 """
+import fasteners
+import subprocess
+import sys
 import time
 from selenium.common.exceptions import ElementNotVisibleException
 from selenium.common.exceptions import NoAlertPresentException
@@ -9,9 +12,26 @@
 from selenium.common.exceptions import NoSuchFrameException
 from selenium.common.exceptions import NoSuchWindowException
 from seleniumbase.common.exceptions import TextNotVisibleException
+from seleniumbase.fixtures import constants
 from seleniumbase import config as sb_config
 
 
+def pip_install(package, version=None):
+    pip_install_lock = fasteners.InterProcessLock(
+        constants.PipInstall.LOCKFILE
+    )
+    with pip_install_lock:
+        if not version:
+            subprocess.check_call(
+                [sys.executable, "-m", "pip", "install", package]
+            )
+        else:
+            package_and_version = package + "==" + str(version)
+            subprocess.check_call(
+                [sys.executable, "-m", "pip", "install", package_and_version]
+            )
+
+
 def format_exc(exception, message):
     """
     Formats an exception message to make the output cleaner.

setup.py

@@ -231,22 +231,12 @@
         'pymysql==1.0.2;python_version>="3.6"',
         'pyotp==2.3.0;python_version<"3.6"',
         'pyotp==2.6.0;python_version>="3.6"',
-        "boto==2.49.0",
         "cffi==1.15.1",
         "toml==0.10.2",
-        'Pillow==6.2.2;python_version<"3.6"',
-        'Pillow==8.4.0;python_version>="3.6" and python_version<"3.7"',
-        'Pillow==9.2.0;python_version>="3.7"',
         'typing-extensions==3.10.0.2;python_version<"3.6"',  # <3.9 for "rich"
         'typing-extensions==4.1.1;python_version>="3.6" and python_version<"3.7"',  # noqa: E501
         'typing-extensions==4.2.0;python_version>="3.7" and python_version<"3.9"',  # noqa: E501
         'rich==12.5.1;python_version>="3.6" and python_version<"4.0"',
-        'tornado==5.1.1;python_version<"3.6"',
-        'tornado==6.1;python_version>="3.6" and python_version<"3.7"',
-        'tornado==6.2;python_version>="3.7"',
-        'pdfminer.six==20191110;python_version<"3.6"',
-        'pdfminer.six==20211012;python_version>="3.6" and python_version<"3.7"',  # noqa: E501
-        'pdfminer.six==20220524;python_version>="3.7"',
     ],
     extras_require={
         # pip install -e .[coverage]
@@ -269,6 +259,18 @@
             'pycodestyle==2.5.0;python_version<"3.6"',
             'pycodestyle==2.8.0;python_version>="3.6"',
         ],
+        # pip install -e .[pdfminer]
+        "pdfminer": [
+            'pdfminer.six==20191110;python_version<"3.6"',
+            'pdfminer.six==20211012;python_version>="3.6" and python_version<"3.7"',  # noqa: E501
+            'pdfminer.six==20220524;python_version>="3.7"',
+        ],
+        # pip install -e .[pillow]
+        "pillow": [
+            'Pillow==6.2.2;python_version<"3.6"',
+            'Pillow==8.4.0;python_version>="3.6" and python_version<"3.7"',
+            'Pillow==9.2.0;python_version>="3.7"',
+        ],
     },
     packages=[
         "seleniumbase",