Skip to content

Refresh Python dependencies, default driver versions, and the Dockerfile #1149

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 8 commits into from
Dec 29, 2021
Merged

Refresh Python dependencies, default driver versions, and the Dockerfile #1149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
51c93ea
Update the Dockerfile
mdmintz Dec 29, 2021
d111bb8
Update default driver versions
mdmintz Dec 29, 2021
48f7c34
Update example code for installing drivers
mdmintz Dec 29, 2021
cb93fd3
Update docs' dependencies
mdmintz Dec 29, 2021
3b8f9fb
Refresh Python dependencies
mdmintz Dec 29, 2021
cee7088
Version 2.3.4
mdmintz Dec 29, 2021
7c0a7c5
Refresh Python dependencies
mdmintz Dec 29, 2021
83bb1c9
Refresh Python dependencies
mdmintz Dec 29, 2021
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
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,19 +83,19 @@ RUN pip3 install --upgrade pip
RUN pip3 install --upgrade setuptools
RUN pip3 install --upgrade setuptools-scm
RUN cd /SeleniumBase && ls && pip3 install -r requirements.txt --upgrade
RUN cd /SeleniumBase && python3 setup.py develop
RUN cd /SeleniumBase && pip3 install .

#=====================
# Download WebDrivers
#=====================
RUN wget https://github.com/mozilla/geckodriver/releases/download/v0.29.1/geckodriver-v0.29.1-linux32.tar.gz
RUN tar -xvzf geckodriver-v0.29.1-linux32.tar.gz
RUN wget https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux32.tar.gz
RUN tar -xvzf geckodriver-v0.30.0-linux32.tar.gz
RUN chmod +x geckodriver
RUN mv geckodriver /usr/local/bin/
RUN wget https://chromedriver.storage.googleapis.com/2.44/chromedriver_linux64.zip
RUN unzip chromedriver_linux64.zip
RUN chmod +x chromedriver
RUN mv chromedriver /usr/local/bin/
RUN chmod +x /usr/bin/chromedriver

#==========================================
# Create entrypoint and grab example tests
Expand Down
2 changes: 1 addition & 1 deletion mkdocs_build/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ importlib-metadata==4.10.0;python_version>="3.6"
bleach==4.1.0
jsmin==3.0.0;python_version>="3.6"
lunr==0.6.1;python_version>="3.6"
nltk==3.6.6;python_version>="3.6"
nltk==3.6.7;python_version>="3.6"
watchdog==2.1.6;python_version>="3.6"
mkdocs==1.2.3;python_version>="3.6"
mkdocs-material==8.1.3;python_version>="3.6"
Expand Down
12 changes: 7 additions & 5 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ packaging>=21.3;python_version>="3.6"
setuptools>=44.1.1;python_version<"3.5"
setuptools>=50.3.2;python_version>="3.5" and python_version<"3.6"
setuptools>=59.6.0;python_version>="3.6" and python_version<"3.7"
setuptools>=60.1.0;python_version>="3.7"
setuptools>=60.1.1;python_version>="3.7"
setuptools-scm>=5.0.2;python_version<"3.6"
setuptools-scm>=6.3.2;python_version>="3.6"
tomli>=1.2.2;python_version>="3.6" and python_version<"3.7"
tomli>=2.0.0;python_version>="3.7"
wheel>=0.37.1
attrs>=21.2.0
attrs>=21.3.0
PyYAML>=6.0;python_version>="3.6"
traitlets>=4.3.3;python_version<"3.7"
traitlets>=5.1.1;python_version>="3.7"
Expand Down Expand Up @@ -46,7 +46,8 @@ more-itertools==8.12.0;python_version>="3.5"
cssselect==1.1.0
sortedcontainers==2.4.0
filelock==3.2.1;python_version<"3.6"
filelock==3.4.0;python_version>="3.6"
filelock==3.4.1;python_version>="3.6" and python_version<"3.7"
filelock==3.4.2;python_version>="3.7"
fasteners==0.16;python_version<"3.5"
fasteners==0.16.3;python_version>="3.5"
execnet==1.9.0
Expand Down Expand Up @@ -95,11 +96,12 @@ ipython==7.30.1;python_version>="3.7"
matplotlib-inline==0.1.3;python_version>="3.7"
colorama==0.4.4
platformdirs==2.0.2;python_version<"3.6"
platformdirs==2.4.0;python_version>="3.6"
platformdirs==2.4.0;python_version>="3.6" and python_version<"3.7"
platformdirs==2.4.1;python_version>="3.7"
pathlib2==2.3.5;python_version<"3.5"
importlib-metadata==2.0.0;python_version<"3.5"
importlib-metadata==2.1.1;python_version>="3.5" and python_version<"3.6"
virtualenv>=20.10.0
virtualenv>=20.11.1
pycparser==2.21
pymysql==0.10.1;python_version<"3.6"
pymysql==1.0.2;python_version>="3.6"
Expand Down
2 changes: 1 addition & 1 deletion seleniumbase/__version__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# seleniumbase package
__version__ = "2.3.3"
__version__ = "2.3.4"
6 changes: 3 additions & 3 deletions seleniumbase/console_scripts/ReadMe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ COMMANDS:
sbase install chromedriver
sbase install geckodriver
sbase install edgedriver
sbase install chromedriver 94
sbase install chromedriver 94.0.4606.61
sbase install chromedriver 96
sbase install chromedriver 96.0.4664.45
sbase install chromedriver latest
sbase install chromedriver latest-1 # (Latest minus one)
sbase install chromedriver -p
sbase install chromedriver latest -p
sbase install edgedriver 94.0.992.38
sbase install edgedriver 96.0.1054.62
```

(Drivers: ``chromedriver``, ``geckodriver``, ``edgedriver``,
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 @@ -126,13 +126,13 @@ def show_install_usage():
print(" sbase install chromedriver")
print(" sbase install geckodriver")
print(" sbase install edgedriver")
print(" sbase install chromedriver 94")
print(" sbase install chromedriver 94.0.4606.61")
print(" sbase install chromedriver 96")
print(" sbase install chromedriver 96.0.4664.45")
print(" sbase install chromedriver latest")
print(" sbase install chromedriver latest-1")
print(" sbase install chromedriver -p")
print(" sbase install chromedriver latest -p")
print(" sbase install edgedriver 94.0.992.38")
print(" sbase install edgedriver 96.0.1054.62")
print(" Output:")
print(" Installs the chosen webdriver to seleniumbase/drivers/")
print(" (chromedriver is required for Chrome automation)")
Expand Down
10 changes: 5 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 @@ -13,13 +13,13 @@
sbase install chromedriver
sbase install geckodriver
sbase install edgedriver
sbase install chromedriver 94.0.4606.61
sbase install chromedriver 94
sbase install chromedriver 96.0.4664.45
sbase install chromedriver 96
sbase install chromedriver latest
sbase install chromedriver latest-1 # (Latest minus one)
sbase install chromedriver -p
sbase install chromedriver latest -p
sbase install edgedriver 94.0.992.38
sbase install edgedriver 96.0.1054.62
Output:
Installs the chosen webdriver to seleniumbase/drivers/
(chromedriver is required for Chrome automation)
Expand All @@ -45,8 +45,8 @@
LOCAL_PATH = "/usr/local/bin/" # On Mac and Linux systems
DEFAULT_CHROMEDRIVER_VERSION = "2.44" # (Specify "latest" to get the latest)
DEFAULT_GECKODRIVER_VERSION = "v0.30.0"
DEFAULT_EDGEDRIVER_VERSION = "93.0.961.52" # (Looks for LATEST_STABLE first)
DEFAULT_OPERADRIVER_VERSION = "v.88.0.4324.104"
DEFAULT_EDGEDRIVER_VERSION = "96.0.1054.62" # (Looks for LATEST_STABLE first)
DEFAULT_OPERADRIVER_VERSION = "v.96.0.4664.45"


def invalid_run_command():
Expand Down
12 changes: 7 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,13 @@
'setuptools>=44.1.1;python_version<"3.5"',
'setuptools>=50.3.2;python_version>="3.5" and python_version<"3.6"',
'setuptools>=59.6.0;python_version>="3.6" and python_version<"3.7"',
'setuptools>=60.1.0;python_version>="3.7"',
'setuptools>=60.1.1;python_version>="3.7"',
'setuptools-scm>=5.0.2;python_version<"3.6"',
'setuptools-scm>=6.3.2;python_version>="3.6"',
'tomli>=1.2.2;python_version>="3.6" and python_version<"3.7"',
'tomli>=2.0.0;python_version>="3.7"',
"wheel>=0.37.1",
"attrs>=21.2.0",
"attrs>=21.3.0",
'PyYAML>=6.0;python_version>="3.6"',
'traitlets>=4.3.3;python_version<"3.7"',
'traitlets>=5.1.1;python_version>="3.7"',
Expand Down Expand Up @@ -166,7 +166,8 @@
"cssselect==1.1.0",
"sortedcontainers==2.4.0",
'filelock==3.2.1;python_version<"3.6"',
'filelock==3.4.0;python_version>="3.6"',
'filelock==3.4.1;python_version>="3.6" and python_version<"3.7"',
'filelock==3.4.2;python_version>="3.7"',
'fasteners==0.16;python_version<"3.5"',
'fasteners==0.16.3;python_version>="3.5"',
"execnet==1.9.0",
Expand Down Expand Up @@ -215,11 +216,12 @@
'matplotlib-inline==0.1.3;python_version>="3.7"', # ipython needs this
"colorama==0.4.4",
'platformdirs==2.0.2;python_version<"3.6"',
'platformdirs==2.4.0;python_version>="3.6"',
'platformdirs==2.4.0;python_version>="3.6" and python_version<"3.7"',
'platformdirs==2.4.1;python_version>="3.7"',
'pathlib2==2.3.5;python_version<"3.5"', # Sync with "virtualenv"
'importlib-metadata==2.0.0;python_version<"3.5"',
'importlib-metadata==2.1.1;python_version>="3.5" and python_version<"3.6"', # noqa: E501
"virtualenv>=20.10.0", # Sync with importlib-metadata and pathlib2
"virtualenv>=20.11.1", # Sync with importlib-metadata and pathlib2
"pycparser==2.21",
'pymysql==0.10.1;python_version<"3.6"',
'pymysql==1.0.2;python_version>="3.6"',
Expand Down