Update Python dependencies and do syntax refactoring

Author: mdmintz

requirements.txt

@@ -1,6 +1,7 @@
 pip>=20.3.4;python_version<"3.6"
 pip>=21.1.1;python_version>="3.6"
 packaging>=20.9
+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>=56.0.0;python_version>="3.6"
@@ -57,7 +58,7 @@ cryptography==3.3.2;python_version>="3.6"
 pyopenssl==19.1.0;python_version<"3.6"
 pyopenssl==20.0.1;python_version>="3.6"
 pygments==2.5.2;python_version<"3.5"
-pygments==2.8.1;python_version>="3.5"
+pygments==2.9.0;python_version>="3.5"
 traitlets==4.3.3;python_version<"3.7"
 traitlets==5.0.5;python_version>="3.7"
 prompt-toolkit==1.0.18;python_version<"3.6"
@@ -66,7 +67,8 @@ decorator==4.4.2
 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.22.0;python_version>="3.7"
+ipython==7.23.0;python_version>="3.7"
+matplotlib-inline==0.1.2;python_version>="3.7"
 colorama==0.4.4
 pathlib2==2.3.5;python_version<"3.5"
 importlib-metadata==2.0.0;python_version<"3.6"

setup.py

@@ -111,68 +111,69 @@
         "Topic :: Software Development :: Testing :: Traffic Generation",
         "Topic :: Utilities",
     ],
-    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
+    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
     install_requires=[
         'pip>=20.3.4;python_version<"3.6"',
         'pip>=21.1.1;python_version>="3.6"',
-        'packaging>=20.9',
+        "packaging>=20.9",
+        "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>=56.0.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',
-        'attrs>=20.3.0',
+        "wheel>=0.36.2",
+        "attrs>=20.3.0",
         'PyYAML>=5.4.1;python_version>="3.6"',
-        'certifi>=2020.12.5',
-        'six==1.15.0',
-        'nose==1.3.7',
+        "certifi>=2020.12.5",
+        "six==1.15.0",
+        "nose==1.3.7",
         'ipdb==0.13.4;python_version<"3.6"',
         'ipdb==0.13.7;python_version>="3.6"',
         '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',  # Must stay in sync with "requests"
+        "idna==2.10",  # Must stay in sync with "requests"
         'chardet==3.0.4;python_version<"3.6"',  # Stay in sync with "requests"
         'chardet==4.0.0;python_version>="3.6"',  # Stay in sync with "requests"
-        'urllib3==1.26.4',  # Must stay in sync with "requests"
-        'requests==2.25.1',
-        'selenium==3.141.0',
-        'msedge-selenium-tools==3.141.3',
+        "urllib3==1.26.4",  # Must stay in sync with "requests"
+        "requests==2.25.1",
+        "selenium==3.141.0",
+        "msedge-selenium-tools==3.141.3",
         'more-itertools==5.0.0;python_version<"3.5"',
         'more-itertools==8.7.0;python_version>="3.5"',
-        'cssselect==1.1.0',
-        'filelock==3.0.12',
-        'fasteners==0.16',
-        'pluggy==0.13.1',
+        "cssselect==1.1.0",
+        "filelock==3.0.12",
+        "fasteners==0.16",
+        "pluggy==0.13.1",
         'py==1.8.1;python_version<"3.5"',
         'py==1.10.0;python_version>="3.5"',
         'pytest==4.6.11;python_version<"3.5"',
         'pytest==6.1.2;python_version>="3.5" and python_version<"3.6"',
         'pytest==6.2.3;python_version>="3.6"',
-        'pytest-forked==1.3.0',
+        "pytest-forked==1.3.0",
         'pytest-html==1.22.1;python_version<"3.6"',
         'pytest-html==2.0.1;python_version>="3.6"',
         'pytest-metadata==1.8.0;python_version<"3.6"',
         'pytest-metadata==1.11.0;python_version>="3.6"',
-        'pytest-ordering==0.6',
+        "pytest-ordering==0.6",
         'pytest-rerunfailures==8.0;python_version<"3.5"',
         'pytest-rerunfailures==9.1.1;python_version>="3.5"',
         'pytest-xdist==1.34.0;python_version<"3.5"',
         'pytest-xdist==2.2.1;python_version>="3.5"',
-        'parameterized==0.8.1',
+        "parameterized==0.8.1",
         '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"',
-        'beautifulsoup4==4.9.3',
+        "beautifulsoup4==4.9.3",
         'cryptography==2.9.2;python_version<"3.5"',
         'cryptography==3.0;python_version>="3.5" and python_version<"3.6"',
         'cryptography==3.3.2;python_version>="3.6"',
         'pyopenssl==19.1.0;python_version<"3.6"',
         'pyopenssl==20.0.1;python_version>="3.6"',
         'pygments==2.5.2;python_version<"3.5"',
-        'pygments==2.8.1;python_version>="3.5"',
+        'pygments==2.9.0;python_version>="3.5"',
         'traitlets==4.3.3;python_version<"3.7"',
         'traitlets==5.0.5;python_version>="3.7"',
         'prompt-toolkit==1.0.18;python_version<"3.6"',
@@ -181,17 +182,18 @@
         '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.22.0;python_version>="3.7"',
-        'colorama==0.4.4',
+        'ipython==7.23.0;python_version>="3.7"',
+        'matplotlib-inline==0.1.2;python_version>="3.7"',
+        "colorama==0.4.4",
         'pathlib2==2.3.5;python_version<"3.5"',  # Sync with "virtualenv"
         'importlib-metadata==2.0.0;python_version<"3.6"',  # Sync "virtualenv"
-        'virtualenv>=20.4.4',  # Sync with importlib-metadata and pathlib2
+        "virtualenv>=20.4.4",  # Sync with importlib-metadata and pathlib2
         'pymysql==0.10.1;python_version<"3.6"',
         'pymysql==1.0.2;python_version>="3.6"',
-        'pyotp==2.6.0',
-        'boto==2.49.0',
-        'cffi==1.14.5',
-        'toml==0.10.2',
+        "pyotp==2.6.0",
+        "boto==2.49.0",
+        "cffi==1.14.5",
+        "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.2.0;python_version>="3.6"',
@@ -203,12 +205,12 @@
     ],
     extras_require={
         # pip install -e .[coverage]
-        'coverage': [
-            'coverage==5.5',
-            'pytest-cov==2.11.1',
+        "coverage": [
+            "coverage==5.5",
+            "pytest-cov==2.11.1",
         ],
         # pip install -e .[flake]
-        'flake': [
+        "flake": [
             'flake8==3.7.9;python_version<"3.5"',
             'flake8==3.9.1;python_version>="3.5"',
             'pyflakes==2.1.1;python_version<"3.5"',
@@ -218,40 +220,42 @@
         ],
     },
     packages=[
-        'seleniumbase',
-        'seleniumbase.common',
-        'seleniumbase.config',
-        'seleniumbase.console_scripts',
-        'seleniumbase.core',
-        'seleniumbase.drivers',
-        'seleniumbase.extensions',
-        'seleniumbase.fixtures',
-        'seleniumbase.masterqa',
-        'seleniumbase.plugins',
-        'seleniumbase.translate',
-        'seleniumbase.utilities',
-        'seleniumbase.utilities.selenium_grid',
-        'seleniumbase.utilities.selenium_ide',
-        'seleniumbase.virtual_display',
+        "seleniumbase",
+        "seleniumbase.common",
+        "seleniumbase.config",
+        "seleniumbase.console_scripts",
+        "seleniumbase.core",
+        "seleniumbase.drivers",
+        "seleniumbase.extensions",
+        "seleniumbase.fixtures",
+        "seleniumbase.masterqa",
+        "seleniumbase.plugins",
+        "seleniumbase.translate",
+        "seleniumbase.utilities",
+        "seleniumbase.utilities.selenium_grid",
+        "seleniumbase.utilities.selenium_ide",
+        "seleniumbase.virtual_display",
     ],
     include_package_data=True,
     entry_points={
-        'console_scripts': [
-            'seleniumbase = seleniumbase.console_scripts.run:main',
-            'sbase = seleniumbase.console_scripts.run:main',  # Simplified name
+        "console_scripts": [
+            "seleniumbase = seleniumbase.console_scripts.run:main",
+            "sbase = seleniumbase.console_scripts.run:main",  # Simplified name
         ],
-        'nose.plugins': [
-            'base_plugin = seleniumbase.plugins.base_plugin:Base',
-            'selenium = seleniumbase.plugins.selenium_plugin:SeleniumBrowser',
-            'page_source = seleniumbase.plugins.page_source:PageSource',
-            'screen_shots = seleniumbase.plugins.screen_shots:ScreenShots',
-            'test_info = seleniumbase.plugins.basic_test_info:BasicTestInfo',
-            ('db_reporting = '
-             'seleniumbase.plugins.db_reporting_plugin:DBReporting'),
-            's3_logging = seleniumbase.plugins.s3_logging_plugin:S3Logging',
+        "nose.plugins": [
+            "base_plugin = seleniumbase.plugins.base_plugin:Base",
+            "selenium = seleniumbase.plugins.selenium_plugin:SeleniumBrowser",
+            "page_source = seleniumbase.plugins.page_source:PageSource",
+            "screen_shots = seleniumbase.plugins.screen_shots:ScreenShots",
+            "test_info = seleniumbase.plugins.basic_test_info:BasicTestInfo",
+            (
+                "db_reporting = "
+                "seleniumbase.plugins.db_reporting_plugin:DBReporting"
+            ),
+            "s3_logging = seleniumbase.plugins.s3_logging_plugin:S3Logging",
         ],
-        'pytest11': ['seleniumbase = seleniumbase.plugins.pytest_plugin']
-    }
+        "pytest11": ["seleniumbase = seleniumbase.plugins.pytest_plugin"],
+    },
 )
 
 # print(os.system("cat seleniumbase.egg-info/PKG-INFO"))