Skip to content

Commit e5c43a9

Browse files
authored
Merge pull request #373 from seleniumbase/geckodriver-install-update
Geckodriver install update
2 parents 1bd65f1 + 3a046d9 commit e5c43a9

File tree

4 files changed

+29
-10
lines changed

4 files changed

+29
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_3.png" title="SeleniumBase" height="48">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
1+
[<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_7a.png" title="SeleniumBase" height="48">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
22

33
[<img src="https://img.shields.io/github/release/seleniumbase/SeleniumBase.svg" alt=" " />](https://github.com/seleniumbase/SeleniumBase/releases) [<img src="https://dev.azure.com/seleniumbase/seleniumbase/_apis/build/status/seleniumbase.SeleniumBase?branchName=master" alt=" " />](https://dev.azure.com/seleniumbase/seleniumbase/_build/latest?definitionId=1&branchName=master) [<img src="https://travis-ci.org/seleniumbase/SeleniumBase.svg?branch=master" alt=" " />](https://travis-ci.org/seleniumbase/SeleniumBase) [<img src="https://badges.gitter.im/seleniumbase/SeleniumBase.svg" alt=" " />](https://gitter.im/seleniumbase/SeleniumBase) [<img src="https://img.shields.io/badge/license-MIT-22BBCC.svg" alt=" " />](https://github.com/seleniumbase/SeleniumBase/blob/master/LICENSE) [<img src="https://img.shields.io/github/stars/seleniumbase/seleniumbase.svg" alt=" " />](https://github.com/seleniumbase/SeleniumBase/stargazers)<br />
44

seleniumbase/console_scripts/run.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ def show_install_usage():
5959
print(" (Drivers: chromedriver, geckodriver, edgedriver")
6060
print(" iedriver, operadriver)")
6161
print(" Options:")
62-
print(" VERSION - Specify version (Chromedriver / EdgeDr ONLY).")
63-
print(" (Default Chromedriver version = 2.44)")
64-
print(' Use "latest" to get the latest Chromedriver.')
62+
print(" VERSION - Specify version")
63+
print(" (Default Chromedriver version = 2.44)")
64+
print(' Use "latest" for the latest version.')
6565
print(" Example:")
6666
print(" seleniumbase install chromedriver")
6767
print(" seleniumbase install chromedriver 76.0.3809.126")

seleniumbase/console_scripts/sb_install.py

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
seleniumbase install {chromedriver|geckodriver|edgedriver|
66
iedriver|operadriver} [OPTIONS]
77
Options:
8-
VERSION - Specify version (Chromedriver / Edgedriver ONLY)
9-
(Default Chromedriver version = 2.44)
10-
Use "latest" to get the latest Chromedriver.
8+
VERSION - Specify version
9+
(Default Chromedriver version = 2.44)
10+
Use "latest" for the latest version.
1111
Example:
1212
seleniumbase install chromedriver
1313
seleniumbase install chromedriver 76.0.3809.126
@@ -34,7 +34,7 @@
3434
urllib3.disable_warnings()
3535
DRIVER_DIR = os.path.dirname(os.path.realpath(drivers.__file__))
3636
DEFAULT_CHROMEDRIVER_VERSION = "2.44"
37-
DEFAULT_GECKODRIVER_VERSION = "v0.24.0"
37+
DEFAULT_GECKODRIVER_VERSION = "v0.25.0"
3838
DEFAULT_EDGEDRIVER_VERSION = "77.0.235.20"
3939
DEFAULT_OPERADRIVER_VERSION = "v.2.40"
4040

@@ -127,6 +127,18 @@ def main():
127127
raise Exception("Could not find Chromedriver to download!\n")
128128
elif name == "geckodriver" or name == "firefoxdriver":
129129
use_version = DEFAULT_GECKODRIVER_VERSION
130+
found_geckodriver = False
131+
if num_args == 4:
132+
use_version = sys.argv[3]
133+
if use_version.lower() == "latest":
134+
last = ("https://api.github.com/repos/"
135+
"mozilla/geckodriver/releases/latest")
136+
url_request = requests.get(last)
137+
if url_request.ok:
138+
found_geckodriver = True
139+
use_version = url_request.json()["tag_name"]
140+
else:
141+
use_version = DEFAULT_GECKODRIVER_VERSION
130142
if "darwin" in sys_plat:
131143
file_name = "geckodriver-%s-macos.tar.gz" % use_version
132144
elif "linux" in sys_plat:
@@ -140,10 +152,17 @@ def main():
140152
else:
141153
raise Exception("Cannot determine which version of Geckodriver "
142154
"(Firefox Driver) to download!")
143-
144155
download_url = ("https://github.com/mozilla/geckodriver/"
145156
"releases/download/"
146157
"%s/%s" % (use_version, file_name))
158+
url_request = None
159+
if not found_geckodriver:
160+
url_request = requests.get(download_url)
161+
if found_geckodriver or url_request.ok:
162+
print("\nGeckodriver version for download = %s" % use_version)
163+
else:
164+
raise Exception("\nCould not find the specified Geckodriver "
165+
"version to download!\n")
147166
elif name == "edgedriver" or name == "msedgedriver":
148167
name = "edgedriver"
149168
use_version = DEFAULT_EDGEDRIVER_VERSION

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
setup(
4747
name='seleniumbase',
48-
version='1.31.7',
48+
version='1.31.8',
4949
description='Fast, Easy, and Reliable Browser Automation & Testing.',
5050
long_description=long_description,
5151
long_description_content_type='text/markdown',

0 commit comments

Comments
 (0)