Skip to content

Commit dfc4c4c

Browse files
authored
Merge pull request #728 from seleniumbase/update-a-few-dependencies
Update a few dependencies
2 parents e7d0e6b + ccb532e commit dfc4c4c

File tree

6 files changed

+9
-14
lines changed

6 files changed

+9
-14
lines changed

examples/github_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ def test_github(self):
1313
# when running in headless mode on Chrome or Edge (Chromium).
1414
if self.headless and (
1515
self.browser == "chrome" or self.browser == "edge"):
16-
self.driver.quit()
1716
self.get_new_driver(
1817
agent="""Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) """
1918
"""AppleWebKit/537.36 (KHTML, like Gecko) """

examples/test_apple_site.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ def test_apple_developer_site_webdriver_instructions(self):
1010
self.message_duration = 2.0
1111
if self.headless and (
1212
self.browser == "chrome" or self.browser == "edge"):
13-
self.driver.quit()
1413
self.get_new_driver(
1514
agent="""Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) """
1615
"""AppleWebKit/537.36 (KHTML, like Gecko) """

requirements.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ prompt-toolkit==3.0.8;python_version>="3.6"
5151
ipython==5.10.0;python_version<"3.5"
5252
ipython==6.5.0;python_version>="3.5" and python_version<"3.6"
5353
ipython==7.16.1;python_version>="3.6" and python_version<"3.7"
54-
ipython==7.18.1;python_version>="3.7"
54+
ipython==7.19.0;python_version>="3.7"
5555
colorama==0.4.4
5656
pathlib2==2.3.5;python_version<"3.5"
5757
importlib-metadata==2.0.0
@@ -62,13 +62,15 @@ brython==3.9.0
6262
pyotp==2.4.1
6363
boto==2.49.0
6464
cffi==1.14.3
65+
rich==9.1.0;python_version>="3.6" and python_version<"4.0"
6566
zipp==1.2.0;python_version<"3.6"
6667
zipp==3.4.0;python_version>="3.6"
67-
rich==9.1.0;python_version>="3.6" and python_version<"4.0"
6868
flake8==3.7.9;python_version<"3.5"
6969
flake8==3.8.4;python_version>="3.5"
7070
pyflakes==2.1.1;python_version<"3.5"
7171
pyflakes==2.2.0;python_version>="3.5"
72+
tornado==5.1.1;python_version<"3.5"
73+
tornado==6.1;python_version>="3.5"
7274
certifi>=2020.6.20
7375
allure-pytest==2.8.19
7476
pdfminer.six==20191110;python_version<"3.5"

seleniumbase/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# seleniumbase package
2-
__version__ = "1.50.3"
2+
__version__ = "1.50.4"

seleniumbase/fixtures/js_utils.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,6 @@ def execute_async_script(driver, script, timeout=settings.EXTREME_TIMEOUT):
4848

4949

5050
def wait_for_angularjs(driver, timeout=settings.LARGE_TIMEOUT, **kwargs):
51-
try:
52-
# If there's an alert, skip
53-
driver.switch_to.alert
54-
return
55-
except Exception:
56-
# If there's no alert, continue
57-
pass
5851
if not settings.WAIT_FOR_ANGULARJS:
5952
return
6053

setup.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
'prompt-toolkit==3.0.8;python_version>="3.6"',
156156
'ipython==6.5.0;python_version>="3.5" and python_version<"3.6"',
157157
'ipython==7.16.1;python_version>="3.6" and python_version<"3.7"',
158-
'ipython==7.18.1;python_version>="3.7"',
158+
'ipython==7.19.0;python_version>="3.7"',
159159
'colorama==0.4.4',
160160
'pathlib2==2.3.5;python_version<"3.5"', # Sync with "virtualenv"
161161
'importlib-metadata==2.0.0', # Sync with "virtualenv"
@@ -166,13 +166,15 @@
166166
'pyotp==2.4.1',
167167
'boto==2.49.0',
168168
'cffi==1.14.3',
169+
'rich==9.1.0;python_version>="3.6" and python_version<"4.0"',
169170
'zipp==1.2.0;python_version<"3.6"',
170171
'zipp==3.4.0;python_version>="3.6"',
171-
'rich==9.1.0;python_version>="3.6" and python_version<"4.0"',
172172
'flake8==3.7.9;python_version<"3.5"',
173173
'flake8==3.8.4;python_version>="3.5"',
174174
'pyflakes==2.1.1;python_version<"3.5"',
175175
'pyflakes==2.2.0;python_version>="3.5"',
176+
'tornado==5.1.1;python_version<"3.5"',
177+
'tornado==6.1;python_version>="3.5"',
176178
'certifi>=2020.6.20',
177179
'allure-pytest==2.8.19',
178180
'pdfminer.six==20191110;python_version<"3.5"',

0 commit comments

Comments
 (0)