diff --git a/Dockerfile b/Dockerfile index 2e51fd95097..e79a87ba1f4 100755 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/mkdocs_build/requirements.txt b/mkdocs_build/requirements.txt index 8e2292e11b8..fc2f8bef62e 100644 --- a/mkdocs_build/requirements.txt +++ b/mkdocs_build/requirements.txt @@ -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" diff --git a/requirements.txt b/requirements.txt index 7c9394ac12a..399a37d88f8 100755 --- a/requirements.txt +++ b/requirements.txt @@ -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" @@ -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 @@ -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" diff --git a/seleniumbase/__version__.py b/seleniumbase/__version__.py index 6b85c9dd5da..9495e13105e 100755 --- a/seleniumbase/__version__.py +++ b/seleniumbase/__version__.py @@ -1,2 +1,2 @@ # seleniumbase package -__version__ = "2.3.3" +__version__ = "2.3.4" diff --git a/seleniumbase/console_scripts/ReadMe.md b/seleniumbase/console_scripts/ReadMe.md index f3081f518af..2c4232f3332 100755 --- a/seleniumbase/console_scripts/ReadMe.md +++ b/seleniumbase/console_scripts/ReadMe.md @@ -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``, diff --git a/seleniumbase/console_scripts/run.py b/seleniumbase/console_scripts/run.py index f5e6086b5e7..c882955c777 100644 --- a/seleniumbase/console_scripts/run.py +++ b/seleniumbase/console_scripts/run.py @@ -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)") diff --git a/seleniumbase/console_scripts/sb_install.py b/seleniumbase/console_scripts/sb_install.py index a6703701a1b..92fb0440443 100755 --- a/seleniumbase/console_scripts/sb_install.py +++ b/seleniumbase/console_scripts/sb_install.py @@ -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) @@ -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(): diff --git a/setup.py b/setup.py index 46ab1206298..34709afdea2 100755 --- a/setup.py +++ b/setup.py @@ -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"', @@ -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", @@ -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"',