Merge pull request #945 from seleniumbase/refactor-dependencies

Update and refactor Python dependencies

Author: mdmintz

README.md

@@ -390,7 +390,7 @@ The code above will leave your browser window open in case there's a failure. (i
 --incognito  #  (Enable Chrome's Incognito mode.)
 --guest  # (Enable Chrome's Guest mode.)
 --devtools  # (Open Chrome's DevTools when the browser opens.)
---reuse-session | --rs  # (Reuse browser session between tests.)
+--reuse-session | --rs  # (Reuse the browser session between tests.)
 --crumbs  # (Delete all cookies between tests reusing a session.)
 --maximize-window  # (Start tests with the web browser window maximized.)
 --save-screenshot  # (Save a screenshot at the end of each test.)

docs/requirements.txt

@@ -5,6 +5,7 @@ joblib==1.0.1;python_version>="3.6"
 Markdown==3.3.4;python_version>="3.6"
 MarkupSafe==2.0.1;python_version>="3.6"
 docutils==0.17.1
+python-dateutil==2.8.2
 pkginfo==1.7.1;python_version>="3.6"
 Jinja2==3.0.1;python_version>="3.6"
 click==8.0.1;python_version>="3.6"
@@ -15,7 +16,7 @@ importlib-metadata==4.6.1;python_version>="3.6"
 lunr==0.6.0;python_version>="3.6"
 nltk==3.6.2;python_version>="3.6"
 watchdog==2.1.3;python_version>="3.6"
-mkdocs==1.2.1;python_version>="3.6"
+mkdocs==1.2.2;python_version>="3.6"
 mkdocs-material==7.1.3;python_version>="3.6"
 mkdocs-exclude-search==0.5.2;python_version>="3.6"
 mkdocs-simple-hooks==0.1.3

examples/raw_parameter_script.py

@@ -9,7 +9,7 @@
 
     One big advantage to running tests with Pytest is that most of this
     is done for you automatically, with the option to update any of the
-    parameters through command line parsing. Pytest also provides you
+    parameters through command-line parsing. Pytest also provides you
     with other plugins, such as ones for generating test reports,
     handling multithreading, and parametrized tests. Depending on your
     specific needs, you may need to call SeleniumBase commands without

help_docs/customizing_test_runs.md

@@ -147,7 +147,7 @@ SeleniumBase provides additional ``pytest`` command-line options for tests:
 --incognito  #  (Enable Chrome's Incognito mode.)
 --guest  # (Enable Chrome's Guest mode.)
 --devtools  # (Open Chrome's DevTools when the browser opens.)
---reuse-session  # (Reuse the browser session between tests.)
+--reuse-session | --rs  # (Reuse the browser session between tests.)
 --crumbs  # (Delete all cookies between tests reusing a session.)
 --maximize-window  # (Start tests with the web browser window maximized.)
 --save-screenshot  # (Save a screenshot at the end of each test.)

requirements.txt

@@ -5,7 +5,7 @@ packaging>=21.0;python_version>="3.6"
 typing-extensions>=3.10.0.0
 setuptools>=44.1.1;python_version<"3.5"
 setuptools>=50.3.2;python_version>="3.5" and python_version<"3.6"
-setuptools>=57.1.0;python_version>="3.6"
+setuptools>=57.2.0;python_version>="3.6"
 setuptools-scm==5.0.2;python_version<"3.6"
 setuptools-scm>=6.0.1;python_version>="3.6"
 wheel>=0.36.2
@@ -21,11 +21,15 @@ parso==0.7.1;python_version<"3.6"
 parso==0.8.2;python_version>="3.6"
 jedi==0.17.2;python_version<"3.6"
 jedi==0.18.0;python_version>="3.6"
-idna==2.10
+idna==2.10;python_version<"3.6"
+idna==3.2;python_version>="3.6"
 chardet==3.0.4;python_version<"3.6"
 chardet==4.0.0;python_version>="3.6"
+charset-normalizer==2.0.3;python_version>="3.6"
 urllib3==1.26.6
-requests==2.25.1
+requests==2.26.0;python_version<"3.5"
+requests==2.25.1;python_version>="3.5" and python_version<"3.6"
+requests==2.26.0;python_version>="3.6"
 selenium==3.141.0
 msedge-selenium-tools==3.141.3
 more-itertools==5.0.0;python_version<"3.5"
@@ -54,6 +58,7 @@ pytest-xdist==1.34.0;python_version<"3.5"
 pytest-xdist==2.2.1;python_version>="3.5" and python_version<"3.6"
 pytest-xdist==2.3.0;python_version>="3.6"
 parameterized==0.8.1
+sbvirtualdisplay==1.0.0
 soupsieve==1.9.6;python_version<"3.5"
 soupsieve==2.0.1;python_version>="3.5" and python_version<"3.6"
 soupsieve==2.2.1;python_version>="3.6"
@@ -77,9 +82,10 @@ ipython==7.16.1;python_version>="3.6" and python_version<"3.7"
 ipython==7.25.0;python_version>="3.7"
 matplotlib-inline==0.1.2;python_version>="3.7"
 colorama==0.4.4
+platformdirs==2.0.2
 pathlib2==2.3.5;python_version<"3.5"
 importlib-metadata==2.0.0;python_version<"3.6"
-virtualenv>=20.4.7
+virtualenv>=20.6.0
 pymysql==0.10.1;python_version<"3.6"
 pymysql==1.0.2;python_version>="3.6"
 pyotp==2.6.0
@@ -89,7 +95,7 @@ toml==0.10.2
 Pillow==6.2.2;python_version<"3.5"
 Pillow==7.2.0;python_version>="3.5" and python_version<"3.6"
 Pillow==8.3.1;python_version>="3.6"
-rich==10.5.0;python_version>="3.6" and python_version<"4.0"
+rich==10.6.0;python_version>="3.6" and python_version<"4.0"
 tornado==5.1.1;python_version<"3.5"
 tornado==6.1;python_version>="3.5"
 pdfminer.six==20191110;python_version<"3.5"

seleniumbase/ReadMe.md

@@ -9,7 +9,6 @@
 * <b>[drivers](https://github.com/seleniumbase/SeleniumBase/tree/master/seleniumbase/drivers):</b> This is the folder where web drivers get downloaded to when installing them.
 * <b>[config](https://github.com/seleniumbase/SeleniumBase/tree/master/seleniumbase/config):</b> Includes [settings.py](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/config/settings.py), which provides default configuration options for tests.
 * <b>[extensions](https://github.com/seleniumbase/SeleniumBase/tree/master/seleniumbase/extensions):</b> This folder contains Chrome extensions that can be used during test runs.
-* <b>[virtual_display](https://github.com/seleniumbase/SeleniumBase/tree/master/seleniumbase/virtual_display):</b> This folder contains code for creating a headless virtual display.
 * <b>[common](https://github.com/seleniumbase/SeleniumBase/tree/master/seleniumbase/common):</b> This folder contains useful Python decorators that can be used in tests.
 * <b>[utilities](https://github.com/seleniumbase/SeleniumBase/tree/master/seleniumbase/utilities):</b> This folder contains code for spinning up your own Selenium Grid, and more.
 * <b>[resources](https://github.com/seleniumbase/SeleniumBase/tree/master/seleniumbase/resources):</b> This folder contains copies of JavaScript resources that are used by tests.

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "1.63.15"
+__version__ = "1.63.16"

seleniumbase/fixtures/base_case.py

@@ -8502,7 +8502,7 @@ def setUp(self, masterqa_mode=False):
                 height = settings.HEADLESS_START_HEIGHT
                 try:
                     # from pyvirtualdisplay import Display  # Skip for own lib
-                    from seleniumbase.virtual_display.display import Display
+                    from sbvirtualdisplay import Display
 
                     self.display = Display(visible=0, size=(width, height))
                     self.display.start()

seleniumbase/plugins/pytest_plugin.py

@@ -1235,7 +1235,7 @@ def pytest_terminal_summary(terminalreporter):
             dash_lock_path = os.path.join(abs_path, dash_lock)
             if os.path.exists(dash_lock_path):
                 sb_config._only_unittest = False
-    if sb_config._has_exception and (
+    if (sb_config._has_exception or sb_config._multithreaded) and (
         sb_config.dashboard and not sb_config._only_unittest
     ):
         # Print link a second time because the first one may be off-screen

seleniumbase/plugins/selenium_plugin.py

@@ -639,7 +639,7 @@ def beforeTest(self, test):
         if self.options.headless:
             try:
                 # from pyvirtualdisplay import Display  # Skip for own lib
-                from seleniumbase.virtual_display.display import Display
+                from sbvirtualdisplay import Display
 
                 self.display = Display(visible=0, size=(1440, 1880))
                 self.display.start()