Skip to content

Commit 2280327

Browse files
mdmintzmdmintz
authored
Merge pull request #1288 from seleniumbase/bug-fixes-and-dependencies
Bug fixes and refreshing dependencies
2 parents bd573f1 + f96da3f commit 2280327

File tree

10 files changed

+52
-44
lines changed

10 files changed

+52
-44
lines changed

‎examples/raw_parameter_script.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@
8181
sb.slow_mode = False
8282
sb.demo_mode = False
8383
sb.time_limit = None
84-
sb.demo_sleep = 1
84+
sb.demo_sleep = None
8585
sb.dashboard = False
8686
sb._dash_initialized = False
87-
sb.message_duration = 2
87+
sb.message_duration = None
8888
sb.block_images = False
8989
sb.external_pdf = False
9090
sb.remote_debug = False

‎mkdocs_build/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ MarkupSafe==2.1.1
1212
pyparsing==3.0.8
1313
keyring==23.5.0
1414
pkginfo==1.8.2
15-
Jinja2==3.1.1
16-
click==8.1.2
15+
Jinja2==3.1.2
16+
click==8.1.3
1717
zipp==3.8.0
1818
readme-renderer==35.0
1919
pymdown-extensions==9.4
@@ -24,7 +24,7 @@ lunr==0.6.2
2424
nltk==3.7
2525
watchdog==2.1.7
2626
mkdocs==1.3.0
27-
mkdocs-material==8.2.10
27+
mkdocs-material==8.2.12
2828
mkdocs-exclude-search==0.6.4
2929
mkdocs-simple-hooks==0.1.5
3030
mkdocs-material-extensions==1.0.3

‎requirements.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ beautifulsoup4==4.10.0;python_version>="3.5" and python_version<"3.6"
8989
beautifulsoup4==4.11.1;python_version>="3.6"
9090
cryptography==2.9.2;python_version<"3.5"
9191
cryptography==3.2.1;python_version>="3.5" and python_version<"3.6"
92-
cryptography==36.0.2;python_version>="3.6"
92+
cryptography==36.0.2;python_version>="3.6" and python_version<"3.7"
93+
cryptography==37.0.1;python_version>="3.7"
9394
pygments==2.5.2;python_version<"3.5"
9495
pygments==2.11.2;python_version>="3.5" and python_version<"3.6"
9596
pygments==2.12.0;python_version>="3.6"
@@ -101,7 +102,7 @@ decorator==5.1.1;python_version>="3.5"
101102
ipython==5.10.0;python_version<"3.5"
102103
ipython==7.9.0;python_version>="3.5" and python_version<"3.6"
103104
ipython==7.16.1;python_version>="3.6" and python_version<"3.7"
104-
ipython==7.32.0;python_version>="3.7"
105+
ipython==7.33.0;python_version>="3.7"
105106
matplotlib-inline==0.1.3;python_version>="3.7"
106107
colorama==0.4.4
107108
importlib-metadata==2.1.3;python_version<"3.6"
@@ -120,7 +121,7 @@ Pillow==8.4.0;python_version>="3.6" and python_version<"3.7"
120121
Pillow==9.1.0;python_version>="3.7"
121122
typing-extensions==3.10.0.2;python_version<"3.6"
122123
typing-extensions==4.0.0;python_version>="3.6" and python_version<"3.9"
123-
rich==12.2.0;python_version>="3.6" and python_version<"4.0"
124+
rich==12.3.0;python_version>="3.6" and python_version<"4.0"
124125
tornado==5.1.1;python_version<"3.5"
125126
tornado==6.1;python_version>="3.5"
126127
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__ = "2.5.2"
2+
__version__ = "2.5.3"

‎seleniumbase/console_scripts/ReadMe.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ COMMANDS:
5353
sbase install chromedriver
5454
sbase install geckodriver
5555
sbase install edgedriver
56-
sbase install chromedriver 100
57-
sbase install chromedriver 100.0.4896.60
56+
sbase install chromedriver 101
57+
sbase install chromedriver 101.0.4951.41
5858
sbase install chromedriver latest
5959
sbase install chromedriver latest-1 # (Latest minus one)
6060
sbase install chromedriver -p
6161
sbase install chromedriver latest -p
62-
sbase install edgedriver 100.0.1185.39
62+
sbase install edgedriver 101.0.1210.32
6363
```
6464

6565
(Drivers: ``chromedriver``, ``geckodriver``, ``edgedriver``,

‎seleniumbase/console_scripts/run.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,13 @@ def show_install_usage():
131131
print(" sbase install chromedriver")
132132
print(" sbase install geckodriver")
133133
print(" sbase install edgedriver")
134-
print(" sbase install chromedriver 100")
135-
print(" sbase install chromedriver 100.0.4896.60")
134+
print(" sbase install chromedriver 101")
135+
print(" sbase install chromedriver 101.0.4951.41")
136136
print(" sbase install chromedriver latest")
137137
print(" sbase install chromedriver latest-1")
138138
print(" sbase install chromedriver -p")
139139
print(" sbase install chromedriver latest -p")
140-
print(" sbase install edgedriver 100.0.1185.39")
140+
print(" sbase install edgedriver 101.0.1210.32")
141141
print(" Output:")
142142
print(" Installs the chosen webdriver to seleniumbase/drivers/")
143143
print(" (chromedriver is required for Chrome automation)")

‎seleniumbase/console_scripts/sb_install.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
sbase install chromedriver
1414
sbase install geckodriver
1515
sbase install edgedriver
16-
sbase install chromedriver 100.0.4896.60
17-
sbase install chromedriver 100
16+
sbase install chromedriver 101.0.4951.41
17+
sbase install chromedriver 101
1818
sbase install chromedriver latest
1919
sbase install chromedriver latest-1 # (Latest minus one)
2020
sbase install chromedriver -p
2121
sbase install chromedriver latest -p
22-
sbase install edgedriver 100.0.1185.39
22+
sbase install edgedriver 101.0.1210.32
2323
Output:
2424
Installs the chosen webdriver to seleniumbase/drivers/
2525
(chromedriver is required for Chrome automation)
@@ -45,7 +45,7 @@
4545
LOCAL_PATH = "/usr/local/bin/" # On Mac and Linux systems
4646
DEFAULT_CHROMEDRIVER_VERSION = "2.44" # (Specify "latest" to get the latest)
4747
DEFAULT_GECKODRIVER_VERSION = "v0.31.0"
48-
DEFAULT_EDGEDRIVER_VERSION = "100.0.1185.39" # (Looks for LATEST_STABLE first)
48+
DEFAULT_EDGEDRIVER_VERSION = "101.0.1210.32" # (Looks for LATEST_STABLE first)
4949
DEFAULT_OPERADRIVER_VERSION = "v.96.0.4664.45"
5050

5151

@@ -64,14 +64,14 @@ def invalid_run_command():
6464
exp += " Example:\n"
6565
exp += " sbase install chromedriver\n"
6666
exp += " sbase install geckodriver\n"
67-
exp += " sbase install edgedriver"
68-
exp += " sbase install chromedriver 100\n"
69-
exp += " sbase install chromedriver 100.0.4896.60\n"
67+
exp += " sbase install edgedriver\n"
68+
exp += " sbase install chromedriver 101\n"
69+
exp += " sbase install chromedriver 101.0.4951.41\n"
7070
exp += " sbase install chromedriver latest\n"
7171
exp += " sbase install chromedriver latest-1\n"
7272
exp += " sbase install chromedriver -p\n"
7373
exp += " sbase install chromedriver latest -p\n"
74-
exp += " sbase install edgedriver 100.0.1185.39"
74+
exp += " sbase install edgedriver 101.0.1210.32\n"
7575
exp += " Output:\n"
7676
exp += " Installs the chosen webdriver to seleniumbase/drivers/\n"
7777
exp += " (chromedriver is required for Chrome automation)\n"
@@ -113,10 +113,8 @@ def main(override=None):
113113

114114
num_args = len(sys.argv)
115115
if (
116-
sys.argv[0].split("/")[-1].lower() == "seleniumbase"
117-
or (sys.argv[0].split("\\")[-1].lower() == "seleniumbase")
118-
or (sys.argv[0].split("/")[-1].lower() == "sbase")
119-
or (sys.argv[0].split("\\")[-1].lower() == "sbase")
116+
"sbase" in sys.argv[0].lower()
117+
or ("seleniumbase" in sys.argv[0].lower())
120118
):
121119
if num_args < 3 or num_args > 5:
122120
invalid_run_command()

‎seleniumbase/core/tour_helper.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"""
55
import os
66
import re
7+
import textwrap
78
import time
89
from selenium.webdriver.common.by import By
910
from seleniumbase import config as sb_config
@@ -1008,6 +1009,8 @@ def export_tour(tour_steps, name=None, filename="my_tour.js", url=None):
10081009
instructions += "loadResources()"
10091010

10101011
instructions += "\n\n//////// Tour Code ////////\n\n"
1012+
first_instructions = instructions
1013+
instructions = " "
10111014
if tour_type == "bootstrap":
10121015
instructions += "function loadTour() { "
10131016
instructions += 'if ( typeof Tour !== "undefined" ) {\n'
@@ -1070,6 +1073,8 @@ def export_tour(tour_steps, name=None, filename="my_tour.js", url=None):
10701073
$tour = tour;\n"""
10711074
else:
10721075
pass
1076+
instructions = textwrap.dedent(instructions)
1077+
instructions = first_instructions + instructions
10731078
instructions += '\n} else { window.setTimeout("loadTour();",100); } '
10741079
instructions += "}\n"
10751080
instructions += "loadTour()\n"

‎seleniumbase/fixtures/base_case.py

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ def test_anything(self):
3737
import re
3838
import shutil
3939
import sys
40+
import textwrap
4041
import time
4142
import unittest
4243
import urllib3
@@ -7815,6 +7816,7 @@ def __create_highchart(
78157816
color_by_point,
78167817
)
78177818
new_chart = chart_libs + chart_css + chart_figure + chart_init + series
7819+
new_chart = textwrap.dedent(new_chart)
78187820
self._chart_data[chart_name] = []
78197821
self._chart_label[chart_name] = []
78207822
self._chart_data[chart_name].append(new_chart)
@@ -7883,6 +7885,7 @@ def add_data_point(self, label, value, color=None, chart_name=None):
78837885
value,
78847886
color,
78857887
)
7888+
data_point = textwrap.dedent(data_point)
78867889
self._chart_data[chart_name].append(data_point)
78877890
if self._chart_first_series[chart_name]:
78887891
self._chart_label[chart_name].append(label)
@@ -7917,13 +7920,13 @@ def save_chart(self, chart_name=None, filename=None, folder=None):
79177920
</script>
79187921
"""
79197922
axis = "xAxis: {\n"
7920-
axis += " labels: {\n"
7921-
axis += " useHTML: true,\n"
7922-
axis += " style: {\n"
7923-
axis += " fontSize: '14px',\n"
7924-
axis += " },\n"
7925-
axis += " },\n"
7926-
axis += " categories: ["
7923+
axis += " labels: {\n"
7924+
axis += " useHTML: true,\n"
7925+
axis += " style: {\n"
7926+
axis += " fontSize: '14px',\n"
7927+
axis += " },\n"
7928+
axis += " },\n"
7929+
axis += "categories: ["
79277930
for label in self._chart_label[chart_name]:
79287931
axis += "'%s'," % label
79297932
axis += "], crosshair: false},"
@@ -8023,13 +8026,13 @@ def extract_chart(self, chart_name=None):
80238026
</script>
80248027
"""
80258028
axis = "xAxis: {\n"
8026-
axis += " labels: {\n"
8027-
axis += " useHTML: true,\n"
8028-
axis += " style: {\n"
8029-
axis += " fontSize: '14px',\n"
8030-
axis += " },\n"
8031-
axis += " },\n"
8032-
axis += " categories: ["
8029+
axis += " labels: {\n"
8030+
axis += " useHTML: true,\n"
8031+
axis += " style: {\n"
8032+
axis += " fontSize: '14px',\n"
8033+
axis += " },\n"
8034+
axis += " },\n"
8035+
axis += "categories: ["
80338036
for label in self._chart_label[chart_name]:
80348037
axis += "'%s'," % label
80358038
axis += "], crosshair: false},"

‎setup.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,8 @@
214214
'beautifulsoup4==4.11.1;python_version>="3.6"',
215215
'cryptography==2.9.2;python_version<"3.5"',
216216
'cryptography==3.2.1;python_version>="3.5" and python_version<"3.6"',
217-
'cryptography==36.0.2;python_version>="3.6"',
217+
'cryptography==36.0.2;python_version>="3.6" and python_version<"3.7"',
218+
'cryptography==37.0.1;python_version>="3.7"',
218219
'pygments==2.5.2;python_version<"3.5"',
219220
'pygments==2.11.2;python_version>="3.5" and python_version<"3.6"',
220221
'pygments==2.12.0;python_version>="3.6"',
@@ -226,7 +227,7 @@
226227
'ipython==5.10.0;python_version<"3.5"',
227228
'ipython==7.9.0;python_version>="3.5" and python_version<"3.6"',
228229
'ipython==7.16.1;python_version>="3.6" and python_version<"3.7"',
229-
'ipython==7.32.0;python_version>="3.7"', # Requires matplotlib-inline
230+
'ipython==7.33.0;python_version>="3.7"', # Requires matplotlib-inline
230231
'matplotlib-inline==0.1.3;python_version>="3.7"', # ipython needs this
231232
"colorama==0.4.4",
232233
'importlib-metadata==2.1.3;python_version<"3.6"',
@@ -245,7 +246,7 @@
245246
'Pillow==9.1.0;python_version>="3.7"',
246247
'typing-extensions==3.10.0.2;python_version<"3.6"', # <3.9 for "rich"
247248
'typing-extensions==4.0.0;python_version>="3.6" and python_version<"3.9"', # noqa: E501
248-
'rich==12.2.0;python_version>="3.6" and python_version<"4.0"',
249+
'rich==12.3.0;python_version>="3.6" and python_version<"4.0"',
249250
'tornado==5.1.1;python_version<"3.5"',
250251
'tornado==6.1;python_version>="3.5"',
251252
'pdfminer.six==20191110;python_version<"3.5"',

0 commit comments

Comments
 (0)