Skip to content

Geckodriver install update #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 11, 2019
Merged

Geckodriver install update #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
057d01d
Update the Geckodriver install script
mdmintz Sep 11, 2019
0376eb2
Update the ReadMe
mdmintz Sep 11, 2019
3a046d9
Version 1.31.8
mdmintz Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[<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)
[<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)

[<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 />

Expand Down
6 changes: 3 additions & 3 deletions seleniumbase/console_scripts/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ def show_install_usage():
print(" (Drivers: chromedriver, geckodriver, edgedriver")
print(" iedriver, operadriver)")
print(" Options:")
print(" VERSION - Specify version (Chromedriver / EdgeDr ONLY).")
print(" (Default Chromedriver version = 2.44)")
print(' Use "latest" to get the latest Chromedriver.')
print(" VERSION - Specify version")
print(" (Default Chromedriver version = 2.44)")
print(' Use "latest" for the latest version.')
print(" Example:")
print(" seleniumbase install chromedriver")
print(" seleniumbase install chromedriver 76.0.3809.126")
Expand Down
29 changes: 24 additions & 5 deletions seleniumbase/console_scripts/sb_install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
seleniumbase install {chromedriver|geckodriver|edgedriver|
iedriver|operadriver} [OPTIONS]
Options:
VERSION - Specify version (Chromedriver / Edgedriver ONLY)
(Default Chromedriver version = 2.44)
Use "latest" to get the latest Chromedriver.
VERSION - Specify version
(Default Chromedriver version = 2.44)
Use "latest" for the latest version.
Example:
seleniumbase install chromedriver
seleniumbase install chromedriver 76.0.3809.126
Expand All @@ -34,7 +34,7 @@
urllib3.disable_warnings()
DRIVER_DIR = os.path.dirname(os.path.realpath(drivers.__file__))
DEFAULT_CHROMEDRIVER_VERSION = "2.44"
DEFAULT_GECKODRIVER_VERSION = "v0.24.0"
DEFAULT_GECKODRIVER_VERSION = "v0.25.0"
DEFAULT_EDGEDRIVER_VERSION = "77.0.235.20"
DEFAULT_OPERADRIVER_VERSION = "v.2.40"

Expand Down Expand Up @@ -127,6 +127,18 @@ def main():
raise Exception("Could not find Chromedriver to download!\n")
elif name == "geckodriver" or name == "firefoxdriver":
use_version = DEFAULT_GECKODRIVER_VERSION
found_geckodriver = False
if num_args == 4:
use_version = sys.argv[3]
if use_version.lower() == "latest":
last = ("https://api.github.com/repos/"
"mozilla/geckodriver/releases/latest")
url_request = requests.get(last)
if url_request.ok:
found_geckodriver = True
use_version = url_request.json()["tag_name"]
else:
use_version = DEFAULT_GECKODRIVER_VERSION
if "darwin" in sys_plat:
file_name = "geckodriver-%s-macos.tar.gz" % use_version
elif "linux" in sys_plat:
Expand All @@ -140,10 +152,17 @@ def main():
else:
raise Exception("Cannot determine which version of Geckodriver "
"(Firefox Driver) to download!")

download_url = ("https://github.com/mozilla/geckodriver/"
"releases/download/"
"%s/%s" % (use_version, file_name))
url_request = None
if not found_geckodriver:
url_request = requests.get(download_url)
if found_geckodriver or url_request.ok:
print("\nGeckodriver version for download = %s" % use_version)
else:
raise Exception("\nCould not find the specified Geckodriver "
"version to download!\n")
elif name == "edgedriver" or name == "msedgedriver":
name = "edgedriver"
use_version = DEFAULT_EDGEDRIVER_VERSION
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

setup(
name='seleniumbase',
version='1.31.7',
version='1.31.8',
description='Fast, Easy, and Reliable Browser Automation & Testing.',
long_description=long_description,
long_description_content_type='text/markdown',
Expand Down