Merge pull request #222 from seleniumbase/requirements-update

Removing "urllib3" requirement to prevent conflicts with "requests"

Author: mdmintz

requirements.txt

@@ -15,7 +15,6 @@ requests>=2.19.1
 unittest2>=1.1.0
 chardet>=3.0.4
 boto>=2.49.0
-urllib3==1.23
 nose==1.3.7
 ipdb==0.11
 flake8==3.5.0

seleniumbase/console_scripts/sb_install.py

@@ -19,10 +19,9 @@
 import shutil
 import sys
 import tarfile
-import urllib3
 import zipfile
 from seleniumbase import drivers  # webdriver storage folder for SeleniumBase
-urllib3.disable_warnings()
+requests.packages.urllib3.disable_warnings()
 DRIVER_DIR = os.path.dirname(os.path.realpath(drivers.__file__))
 
 
@@ -188,7 +187,7 @@ def main():
     if not os.path.exists(downloads_folder):
         os.mkdir(downloads_folder)
     local_file = open(file_path, 'wb')
-    http = urllib3.PoolManager()
+    http = requests.packages.urllib3.PoolManager()
     remote_file = http.request('GET', download_url, preload_content=False)
     print('\nDownloading %s from:\n%s ...' % (file_name, download_url))
     local_file.write(remote_file.read())

seleniumbase/core/browser_launcher.py

@@ -104,8 +104,6 @@ def _set_chrome_options(
                 chrome_options, proxy_string, proxy_user, proxy_pass)
             chrome_options.add_extension(DRIVER_DIR + "/proxy.zip")
         chrome_options.add_argument('--proxy-server=%s' % proxy_string)
-    if "win32" in sys.platform or "win64" in sys.platform:
-        chrome_options.add_argument("--log-level=3")
     return chrome_options
 
 

setup.py

@@ -17,7 +17,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.16.6',
+    version='1.16.7',
     description='All-In-One Test Automation Framework',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -67,7 +67,6 @@
         'unittest2>=1.1.0',
         'chardet>=3.0.4',
         'boto>=2.49.0',
-        'urllib3==1.23',  # Keep at ==1.23
         'nose==1.3.7',  # Keep at ==1.3.7
         'ipdb==0.11',
         'flake8==3.5.0',