Merge pull request #717 from seleniumbase/refactoring-and-other-updates

Refactoring and other updates

Author: mdmintz

README.md

@@ -111,7 +111,6 @@ pip install -e .  # Editable install
  ___/ /  __/ /  __/ / / / / /_/ / / / / / / /_) / (_/ /__  /  __/
 /____/\___/_/\___/_/ /_/_/\__,_/_/ /_/ /_/_____/\__,_/____/\___/ 
 -----------------------------------------------------------------
-[seleniumbase <VERSION> (<PATH>)]
 
  * USAGE: "seleniumbase [COMMAND] [PARAMETERS]"
  *    OR:        "sbase [COMMAND] [PARAMETERS]"

docs/requirements.txt

@@ -1,7 +1,7 @@
-regex>=2020.10.11
+regex>=2020.9.27
 tqdm>=4.50.2
 livereload==2.6.3;python_version>="3.6"
-Markdown==3.3
+Markdown==3.3.1
 readme-renderer==27.0
 pymdown-extensions==8.0.1
 mkdocs==1.1.2

install.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-python -m easy_install --upgrade pip
+python -m pip --upgrade pip
 pip install -e . --upgrade --no-cache-dir --progress-bar off
 seleniumbase install chromedriver
 seleniumbase install geckodriver

requirements.txt

@@ -47,15 +47,15 @@ pygments==2.7.1;python_version>="3.5"
 traitlets==4.3.3;python_version<"3.7"
 traitlets==5.0.4;python_version>="3.7"
 prompt-toolkit==1.0.18;python_version<"3.6"
-prompt-toolkit==3.0.7;python_version>="3.6"
+prompt-toolkit==3.0.8;python_version>="3.6"
 ipython==5.10.0;python_version<"3.5"
 ipython==6.5.0;python_version>="3.5" and python_version<"3.6"
 ipython==7.16.1;python_version>="3.6" and python_version<"3.7"
 ipython==7.18.1;python_version>="3.7"
-colorama==0.4.3
+colorama==0.4.4
 pathlib2==2.3.5;python_version<"3.5"
 importlib-metadata==2.0.0
-virtualenv>=20.0.33
+virtualenv>=20.0.34
 pymysql==0.10.1
 coverage==5.3
 brython==3.9.0

seleniumbase/__init__.py

@@ -1,3 +1,4 @@
+from seleniumbase.__version__ import __version__  # noqa
 from seleniumbase.fixtures.base_case import BaseCase  # noqa
 from seleniumbase.masterqa.master_qa import MasterQA  # noqa
 from seleniumbase.common import decorators  # noqa

seleniumbase/__version__.py

@@ -0,0 +1,2 @@
+# seleniumbase package
+__version__ = "1.49.27"

seleniumbase/console_scripts/run.py

@@ -50,11 +50,15 @@ def show_usage():
 
 
 def show_basic_usage():
+    import time
     from seleniumbase.console_scripts import logo_helper
     seleniumbase_logo = logo_helper.get_seleniumbase_logo()
     print(seleniumbase_logo)
-    print("%s" % get_version()[0:1])
-    print("")
+    time.sleep(0.25)  # Enough time to see the logo
+    print()
+    show_package_location()
+    show_version_info()
+    print()
     sc = ("")
     sc += (' * USAGE: "seleniumbase [COMMAND] [PARAMETERS]"\n')
     sc += (' *    OR:        "sbase [COMMAND] [PARAMETERS]"\n')
@@ -431,19 +435,39 @@ def show_grid_node_usage():
     print("")
 
 
-def get_version():
-    import pkg_resources
+def get_version_info():
+    # from pkg_resources import get_distribution
+    # version = get_distribution("seleniumbase").version
+    from seleniumbase import __version__
     version_info = None
-    try:
-        version_info = pkg_resources.require("seleniumbase")[0:1]
-    except Exception:
-        version_info = ["ERROR: Cannot detect version! Please reinstall!"]
+    c1 = colorama.Fore.BLUE + colorama.Back.LIGHTCYAN_EX
+    c2 = colorama.Fore.BLUE + colorama.Back.LIGHTGREEN_EX
+    c3 = colorama.Fore.BLUE + colorama.Back.LIGHTYELLOW_EX
+    cr = colorama.Style.RESET_ALL
+    sb_text = c1 + "selenium" + c2 + "base" + cr
+    version_info = "%s %s%s%s" % (sb_text, c3, __version__, cr)
     return version_info
 
 
 def show_version_info():
-    version = get_version()
-    print('\n%s\n' % version)
+    version_info = get_version_info()
+    print('%s' % version_info)
+
+
+def get_package_location():
+    # from pkg_resources import get_distribution
+    # location = get_distribution("seleniumbase").location
+    import os
+    import seleniumbase
+    location = os.path.dirname(os.path.realpath(seleniumbase.__file__))
+    if location.endswith("seleniumbase"):
+        location = location[0:-len("seleniumbase")]
+    return location
+
+
+def show_package_location():
+    location = get_package_location()
+    print("%s" % location)
 
 
 def show_options():
@@ -666,7 +690,13 @@ def main():
             show_grid_node_usage()
     elif command == "version" or command == "--version":
         if len(command_args) == 0:
+            from seleniumbase.console_scripts import logo_helper
+            seleniumbase_logo = logo_helper.get_seleniumbase_logo()
+            print(seleniumbase_logo)
+            print()
+            show_package_location()
             show_version_info()
+            print()
         else:
             show_basic_usage()
     elif command == "options" or command == "--options":

seleniumbase/fixtures/base_case.py

@@ -6090,7 +6090,11 @@ def __scroll_to_element(self, element, selector=None, by=By.CSS_SELECTOR):
         self.__demo_mode_pause_if_active(tiny=True)
 
     def __slow_scroll_to_element(self, element):
-        js_utils.slow_scroll_to_element(self.driver, element, self.browser)
+        try:
+            js_utils.slow_scroll_to_element(self.driver, element, self.browser)
+        except Exception:
+            # Scroll to the element instantly if the slow scroll fails
+            js_utils.scroll_to_element(self.driver, element)
 
     def __highlight_with_assert_success(
             self, message, selector, by=By.CSS_SELECTOR):

setup.py

@@ -8,11 +8,11 @@
 import sys
 
 
-this_directory = os.path.abspath(os.path.dirname(__file__))
+this_dir = os.path.abspath(os.path.dirname(__file__))
 long_description = None
 total_description = None
 try:
-    with open(os.path.join(this_directory, 'README.md'), 'rb') as f:
+    with open(os.path.join(this_dir, 'README.md'), 'rb') as f:
         total_description = f.read().decode('utf-8')
     description_lines = total_description.split('\n')
     long_description_lines = []
@@ -22,6 +22,11 @@
     long_description = "\n".join(long_description_lines)
 except IOError:
     long_description = 'Reliable Browser Automation & Testing Framework'
+about = {}
+# Get the package version from the seleniumbase/__version__.py file
+with open(os.path.join(
+        this_dir, 'seleniumbase', '__version__.py'), 'rb') as f:
+    exec(f.read().decode('utf-8'), about)
 
 if sys.argv[-1] == 'publish':
     reply = None
@@ -54,7 +59,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.49.26',
+    version=about['__version__'],
     description='A complete framework for Web-UI testing | seleniumbase.io',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -66,6 +71,10 @@
     license="MIT",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
+        "Environment :: Console",
+        "Environment :: MacOS X",
+        "Environment :: Win32 (MS Windows)",
+        "Environment :: Web Environment",
         "Framework :: Pytest",
         "Intended Audience :: Developers",
         "Intended Audience :: Information Technology",
@@ -91,6 +100,7 @@
         "Topic :: Software Development :: Testing :: Traffic Generation",
         "Topic :: Utilities",
     ],
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
     install_requires=[
         'pip>=20.2.3',
         'packaging>=20.4',
@@ -142,14 +152,14 @@
         'traitlets==5.0.4;python_version>="3.7"',
         'ipython==5.10.0;python_version<"3.5"',
         'prompt-toolkit==1.0.18;python_version<"3.6"',
-        'prompt-toolkit==3.0.7;python_version>="3.6"',
+        'prompt-toolkit==3.0.8;python_version>="3.6"',
         'ipython==6.5.0;python_version>="3.5" and python_version<"3.6"',
         'ipython==7.16.1;python_version>="3.6" and python_version<"3.7"',
         'ipython==7.18.1;python_version>="3.7"',
-        'colorama==0.4.3',
+        'colorama==0.4.4',
         'pathlib2==2.3.5;python_version<"3.5"',  # Sync with "virtualenv"
         'importlib-metadata==2.0.0',  # Sync with "virtualenv"
-        'virtualenv>=20.0.33',  # Sync with importlib-metadata and pathlib2
+        'virtualenv>=20.0.34',  # Sync with importlib-metadata and pathlib2
         'pymysql==0.10.1',
         'coverage==5.3',
         'brython==3.9.0',

win_install.bat

@@ -1,5 +1,5 @@
 @ECHO OFF
-python -m easy_install --upgrade pip
+py -m pip --upgrade pip
 pip install -e . --upgrade --no-cache-dir --progress-bar off
 seleniumbase install chromedriver
 seleniumbase install geckodriver