Skip to content

Commit

Permalink
Merge pull request #227 from seleniumbase/sync-requests-and-urllib3
Browse files Browse the repository at this point in the history
Sync "requests" and "urllib3" dependencies
  • Loading branch information
mdmintz committed Oct 19, 2018
2 parents 1a06dcb + 5b34a1f commit ac32d8a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ ipdb
chardet
unittest2
selenium==3.14.1
requests>=2.20.0
requests==2.20.0
urllib3==1.24
pytest>=3.9.1
pytest-cov>=2.6.0
pytest-html>=1.19.0
Expand Down
5 changes: 3 additions & 2 deletions seleniumbase/console_scripts/sb_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@
import os
import platform
import requests
import urllib3 # Some systems don't have requests.packages.urllib3
import shutil
import sys
import tarfile
import zipfile
from seleniumbase import drivers # webdriver storage folder for SeleniumBase
requests.packages.urllib3.disable_warnings()
urllib3.disable_warnings()
DRIVER_DIR = os.path.dirname(os.path.realpath(drivers.__file__))


Expand Down Expand Up @@ -185,7 +186,7 @@ def main():
if not os.path.exists(downloads_folder):
os.mkdir(downloads_folder)
local_file = open(file_path, 'wb')
http = requests.packages.urllib3.PoolManager()
http = 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())
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

setup(
name='seleniumbase',
version='1.16.10',
version='1.16.11',
description='All-In-One Test Automation Framework',
long_description=long_description,
long_description_content_type='text/markdown',
Expand Down Expand Up @@ -59,7 +59,8 @@
'chardet',
'unittest2',
'selenium==3.14.1',
'requests>=2.20.0',
'requests==2.20.0', # Changing this may effect "urllib3"
'urllib3==1.24', # Keep this lib in sync with "requests"
'pytest>=3.9.1',
'pytest-cov>=2.6.0',
'pytest-html>=1.19.0',
Expand Down

0 comments on commit ac32d8a

Please sign in to comment.