Skip to content

Commit dd5aab5

Browse files
mdmintzmdmintz
authored
Merge pull request #1149 from seleniumbase/docker-dependencies-drivers
Refresh Python dependencies, default driver versions, and the Dockerfile
2 parents 2810360 + 83bb1c9 commit dd5aab5

File tree

8 files changed

+31
-27
lines changed

8 files changed

+31
-27
lines changed

‎Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,19 @@ RUN pip3 install --upgrade pip
8383
RUN pip3 install --upgrade setuptools
8484
RUN pip3 install --upgrade setuptools-scm
8585
RUN cd /SeleniumBase && ls && pip3 install -r requirements.txt --upgrade
86-
RUN cd /SeleniumBase && python3 setup.py develop
86+
RUN cd /SeleniumBase && pip3 install .
8787

8888
#=====================
8989
# Download WebDrivers
9090
#=====================
91-
RUN wget https://github.com/mozilla/geckodriver/releases/download/v0.29.1/geckodriver-v0.29.1-linux32.tar.gz
92-
RUN tar -xvzf geckodriver-v0.29.1-linux32.tar.gz
91+
RUN wget https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux32.tar.gz
92+
RUN tar -xvzf geckodriver-v0.30.0-linux32.tar.gz
9393
RUN chmod +x geckodriver
9494
RUN mv geckodriver /usr/local/bin/
9595
RUN wget https://chromedriver.storage.googleapis.com/2.44/chromedriver_linux64.zip
9696
RUN unzip chromedriver_linux64.zip
97+
RUN chmod +x chromedriver
9798
RUN mv chromedriver /usr/local/bin/
98-
RUN chmod +x /usr/bin/chromedriver
9999

100100
#==========================================
101101
# Create entrypoint and grab example tests

‎mkdocs_build/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ importlib-metadata==4.10.0;python_version>="3.6"
1818
bleach==4.1.0
1919
jsmin==3.0.0;python_version>="3.6"
2020
lunr==0.6.1;python_version>="3.6"
21-
nltk==3.6.6;python_version>="3.6"
21+
nltk==3.6.7;python_version>="3.6"
2222
watchdog==2.1.6;python_version>="3.6"
2323
mkdocs==1.2.3;python_version>="3.6"
2424
mkdocs-material==8.1.3;python_version>="3.6"

‎requirements.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ packaging>=21.3;python_version>="3.6"
55
setuptools>=44.1.1;python_version<"3.5"
66
setuptools>=50.3.2;python_version>="3.5" and python_version<"3.6"
77
setuptools>=59.6.0;python_version>="3.6" and python_version<"3.7"
8-
setuptools>=60.1.0;python_version>="3.7"
8+
setuptools>=60.1.1;python_version>="3.7"
99
setuptools-scm>=5.0.2;python_version<"3.6"
1010
setuptools-scm>=6.3.2;python_version>="3.6"
1111
tomli>=1.2.2;python_version>="3.6" and python_version<"3.7"
1212
tomli>=2.0.0;python_version>="3.7"
1313
wheel>=0.37.1
14-
attrs>=21.2.0
14+
attrs>=21.3.0
1515
PyYAML>=6.0;python_version>="3.6"
1616
traitlets>=4.3.3;python_version<"3.7"
1717
traitlets>=5.1.1;python_version>="3.7"
@@ -46,7 +46,8 @@ more-itertools==8.12.0;python_version>="3.5"
4646
cssselect==1.1.0
4747
sortedcontainers==2.4.0
4848
filelock==3.2.1;python_version<"3.6"
49-
filelock==3.4.0;python_version>="3.6"
49+
filelock==3.4.1;python_version>="3.6" and python_version<"3.7"
50+
filelock==3.4.2;python_version>="3.7"
5051
fasteners==0.16;python_version<"3.5"
5152
fasteners==0.16.3;python_version>="3.5"
5253
execnet==1.9.0
@@ -95,11 +96,12 @@ ipython==7.30.1;python_version>="3.7"
9596
matplotlib-inline==0.1.3;python_version>="3.7"
9697
colorama==0.4.4
9798
platformdirs==2.0.2;python_version<"3.6"
98-
platformdirs==2.4.0;python_version>="3.6"
99+
platformdirs==2.4.0;python_version>="3.6" and python_version<"3.7"
100+
platformdirs==2.4.1;python_version>="3.7"
99101
pathlib2==2.3.5;python_version<"3.5"
100102
importlib-metadata==2.0.0;python_version<"3.5"
101103
importlib-metadata==2.1.1;python_version>="3.5" and python_version<"3.6"
102-
virtualenv>=20.10.0
104+
virtualenv>=20.11.1
103105
pycparser==2.21
104106
pymysql==0.10.1;python_version<"3.6"
105107
pymysql==1.0.2;python_version>="3.6"

‎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.3.3"
2+
__version__ = "2.3.4"

‎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 94
57-
sbase install chromedriver 94.0.4606.61
56+
sbase install chromedriver 96
57+
sbase install chromedriver 96.0.4664.45
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 94.0.992.38
62+
sbase install edgedriver 96.0.1054.62
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
@@ -126,13 +126,13 @@ def show_install_usage():
126126
print(" sbase install chromedriver")
127127
print(" sbase install geckodriver")
128128
print(" sbase install edgedriver")
129-
print(" sbase install chromedriver 94")
130-
print(" sbase install chromedriver 94.0.4606.61")
129+
print(" sbase install chromedriver 96")
130+
print(" sbase install chromedriver 96.0.4664.45")
131131
print(" sbase install chromedriver latest")
132132
print(" sbase install chromedriver latest-1")
133133
print(" sbase install chromedriver -p")
134134
print(" sbase install chromedriver latest -p")
135-
print(" sbase install edgedriver 94.0.992.38")
135+
print(" sbase install edgedriver 96.0.1054.62")
136136
print(" Output:")
137137
print(" Installs the chosen webdriver to seleniumbase/drivers/")
138138
print(" (chromedriver is required for Chrome automation)")

‎seleniumbase/console_scripts/sb_install.py

Lines changed: 5 additions & 5 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 94.0.4606.61
17-
sbase install chromedriver 94
16+
sbase install chromedriver 96.0.4664.45
17+
sbase install chromedriver 96
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 94.0.992.38
22+
sbase install edgedriver 96.0.1054.62
2323
Output:
2424
Installs the chosen webdriver to seleniumbase/drivers/
2525
(chromedriver is required for Chrome automation)
@@ -45,8 +45,8 @@
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.30.0"
48-
DEFAULT_EDGEDRIVER_VERSION = "93.0.961.52" # (Looks for LATEST_STABLE first)
49-
DEFAULT_OPERADRIVER_VERSION = "v.88.0.4324.104"
48+
DEFAULT_EDGEDRIVER_VERSION = "96.0.1054.62" # (Looks for LATEST_STABLE first)
49+
DEFAULT_OPERADRIVER_VERSION = "v.96.0.4664.45"
5050

5151

5252
def invalid_run_command():

‎setup.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@
125125
'setuptools>=44.1.1;python_version<"3.5"',
126126
'setuptools>=50.3.2;python_version>="3.5" and python_version<"3.6"',
127127
'setuptools>=59.6.0;python_version>="3.6" and python_version<"3.7"',
128-
'setuptools>=60.1.0;python_version>="3.7"',
128+
'setuptools>=60.1.1;python_version>="3.7"',
129129
'setuptools-scm>=5.0.2;python_version<"3.6"',
130130
'setuptools-scm>=6.3.2;python_version>="3.6"',
131131
'tomli>=1.2.2;python_version>="3.6" and python_version<"3.7"',
132132
'tomli>=2.0.0;python_version>="3.7"',
133133
"wheel>=0.37.1",
134-
"attrs>=21.2.0",
134+
"attrs>=21.3.0",
135135
'PyYAML>=6.0;python_version>="3.6"',
136136
'traitlets>=4.3.3;python_version<"3.7"',
137137
'traitlets>=5.1.1;python_version>="3.7"',
@@ -166,7 +166,8 @@
166166
"cssselect==1.1.0",
167167
"sortedcontainers==2.4.0",
168168
'filelock==3.2.1;python_version<"3.6"',
169-
'filelock==3.4.0;python_version>="3.6"',
169+
'filelock==3.4.1;python_version>="3.6" and python_version<"3.7"',
170+
'filelock==3.4.2;python_version>="3.7"',
170171
'fasteners==0.16;python_version<"3.5"',
171172
'fasteners==0.16.3;python_version>="3.5"',
172173
"execnet==1.9.0",
@@ -215,11 +216,12 @@
215216
'matplotlib-inline==0.1.3;python_version>="3.7"', # ipython needs this
216217
"colorama==0.4.4",
217218
'platformdirs==2.0.2;python_version<"3.6"',
218-
'platformdirs==2.4.0;python_version>="3.6"',
219+
'platformdirs==2.4.0;python_version>="3.6" and python_version<"3.7"',
220+
'platformdirs==2.4.1;python_version>="3.7"',
219221
'pathlib2==2.3.5;python_version<"3.5"', # Sync with "virtualenv"
220222
'importlib-metadata==2.0.0;python_version<"3.5"',
221223
'importlib-metadata==2.1.1;python_version>="3.5" and python_version<"3.6"', # noqa: E501
222-
"virtualenv>=20.10.0", # Sync with importlib-metadata and pathlib2
224+
"virtualenv>=20.11.1", # Sync with importlib-metadata and pathlib2
223225
"pycparser==2.21",
224226
'pymysql==0.10.1;python_version<"3.6"',
225227
'pymysql==1.0.2;python_version>="3.6"',

0 commit comments

Comments
 (0)