Skip to content

Commit ac32d8a

Browse files
authored
Merge pull request #227 from seleniumbase/sync-requests-and-urllib3
Sync "requests" and "urllib3" dependencies
2 parents 1a06dcb + 5b34a1f commit ac32d8a

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ ipdb
77
chardet
88
unittest2
99
selenium==3.14.1
10-
requests>=2.20.0
10+
requests==2.20.0
11+
urllib3==1.24
1112
pytest>=3.9.1
1213
pytest-cov>=2.6.0
1314
pytest-html>=1.19.0

seleniumbase/console_scripts/sb_install.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
import os
1717
import platform
1818
import requests
19+
import urllib3 # Some systems don't have requests.packages.urllib3
1920
import shutil
2021
import sys
2122
import tarfile
2223
import zipfile
2324
from seleniumbase import drivers # webdriver storage folder for SeleniumBase
24-
requests.packages.urllib3.disable_warnings()
25+
urllib3.disable_warnings()
2526
DRIVER_DIR = os.path.dirname(os.path.realpath(drivers.__file__))
2627

2728

@@ -185,7 +186,7 @@ def main():
185186
if not os.path.exists(downloads_folder):
186187
os.mkdir(downloads_folder)
187188
local_file = open(file_path, 'wb')
188-
http = requests.packages.urllib3.PoolManager()
189+
http = urllib3.PoolManager()
189190
remote_file = http.request('GET', download_url, preload_content=False)
190191
print('\nDownloading %s from:\n%s ...' % (file_name, download_url))
191192
local_file.write(remote_file.read())

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
setup(
1919
name='seleniumbase',
20-
version='1.16.10',
20+
version='1.16.11',
2121
description='All-In-One Test Automation Framework',
2222
long_description=long_description,
2323
long_description_content_type='text/markdown',
@@ -59,7 +59,8 @@
5959
'chardet',
6060
'unittest2',
6161
'selenium==3.14.1',
62-
'requests>=2.20.0',
62+
'requests==2.20.0', # Changing this may effect "urllib3"
63+
'urllib3==1.24', # Keep this lib in sync with "requests"
6364
'pytest>=3.9.1',
6465
'pytest-cov>=2.6.0',
6566
'pytest-html>=1.19.0',

0 commit comments

Comments
 (0)