Skip to content

Commit 83a51d0

Browse files
authored
Merge pull request #2783 from seleniumbase/refresh-dependencies-and-fix-wire-mode
Refresh dependencies and fix Wire Mode
2 parents 00add3a + 301e544 commit 83a51d0

File tree

6 files changed

+44
-14
lines changed

6 files changed

+44
-14
lines changed

mkdocs_build/requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# mkdocs dependencies for generating the seleniumbase.io website
22
# Minimum Python version: 3.8 (for generating docs only)
33

4-
regex>=2024.5.10
4+
regex>=2024.5.15
55
pymdown-extensions>=10.8.1
66
pipdeptree>=2.20.0
77
python-dateutil>=2.8.2
@@ -20,7 +20,7 @@ lxml==5.2.2
2020
pyquery==2.0.0
2121
readtime==3.0.0
2222
mkdocs==1.6.0
23-
mkdocs-material==9.5.22
23+
mkdocs-material==9.5.23
2424
mkdocs-exclude-search==0.6.6
2525
mkdocs-simple-hooks==0.1.5
2626
mkdocs-material-extensions==1.3.1

requirements.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ exceptiongroup>=1.2.1
1010
filelock>=3.12.2;python_version<"3.8"
1111
filelock>=3.14.0;python_version>="3.8"
1212
platformdirs>=4.0.0;python_version<"3.8"
13-
platformdirs>=4.2.1;python_version>="3.8"
13+
platformdirs>=4.2.2;python_version>="3.8"
1414
typing-extensions>=4.11.0;python_version>="3.8"
1515
parse>=1.20.1
1616
parse-type>=0.6.2
@@ -27,11 +27,11 @@ sniffio==1.3.1
2727
h11==0.14.0
2828
outcome==1.3.0.post0
2929
trio==0.22.2;python_version<"3.8"
30-
trio==0.25.0;python_version>="3.8"
30+
trio==0.25.1;python_version>="3.8"
3131
trio-websocket==0.11.1
3232
wsproto==1.2.0
3333
selenium==4.11.2;python_version<"3.8"
34-
selenium==4.20.0;python_version>="3.8"
34+
selenium==4.21.0;python_version>="3.8"
3535
cssselect==1.2.0
3636
sortedcontainers==2.4.0
3737
fasteners==0.19

seleniumbase/__version__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# seleniumbase package
2-
__version__ = "4.26.4"
2+
__version__ = "4.27.0"

seleniumbase/core/browser_launcher.py

+32-4
Original file line numberDiff line numberDiff line change
@@ -1772,14 +1772,28 @@ def get_remote_driver(
17721772
pip_find_lock = fasteners.InterProcessLock(
17731773
constants.PipInstall.FINDLOCK
17741774
)
1775-
with pip_find_lock:
1775+
with pip_find_lock: # Prevent issues with multiple processes
17761776
try:
17771777
from seleniumwire import webdriver
1778+
import blinker
1779+
try:
1780+
use_blinker_ver = constants.SeleniumWire.BLINKER_VER
1781+
if blinker.__version__ != use_blinker_ver:
1782+
shared_utils.pip_install(
1783+
"blinker", version=use_blinker_ver
1784+
)
1785+
except Exception:
1786+
pass
1787+
del blinker
17781788
except Exception:
1789+
shared_utils.pip_install(
1790+
"blinker", version=constants.SeleniumWire.BLINKER_VER
1791+
)
17791792
shared_utils.pip_install(
17801793
"selenium-wire", version=constants.SeleniumWire.VER
17811794
)
17821795
from seleniumwire import webdriver
1796+
warnings.simplefilter("ignore", category=DeprecationWarning)
17831797
else:
17841798
from selenium import webdriver
17851799

@@ -2186,17 +2200,31 @@ def get_local_driver(
21862200
downloads_path = DOWNLOADS_FOLDER
21872201
b_path = binary_location
21882202
if use_wire:
2189-
driver_fixing_lock = fasteners.InterProcessLock(
2190-
constants.MultiBrowser.DRIVER_FIXING_LOCK
2203+
pip_find_lock = fasteners.InterProcessLock(
2204+
constants.PipInstall.FINDLOCK
21912205
)
2192-
with driver_fixing_lock: # Prevent multi-processes mode issues
2206+
with pip_find_lock: # Prevent issues with multiple processes
21932207
try:
21942208
from seleniumwire import webdriver
2209+
import blinker
2210+
try:
2211+
use_blinker_ver = constants.SeleniumWire.BLINKER_VER
2212+
if blinker.__version__ != use_blinker_ver:
2213+
shared_utils.pip_install(
2214+
"blinker", version=use_blinker_ver
2215+
)
2216+
except Exception:
2217+
pass
2218+
del blinker
21952219
except Exception:
2220+
shared_utils.pip_install(
2221+
"blinker", version=constants.SeleniumWire.BLINKER_VER
2222+
)
21962223
shared_utils.pip_install(
21972224
"selenium-wire", version=constants.SeleniumWire.VER
21982225
)
21992226
from seleniumwire import webdriver
2227+
warnings.simplefilter("ignore", category=DeprecationWarning)
22002228
else:
22012229
from selenium import webdriver
22022230

seleniumbase/fixtures/constants.py

+1
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@ class ProxyPy:
351351
class SeleniumWire:
352352
# The version installed if selenium-wire is not installed
353353
VER = "5.1.0"
354+
BLINKER_VER = "1.7.0" # The "blinker" dependency version
354355

355356

356357
class Mobile:

setup.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
'filelock>=3.12.2;python_version<"3.8"',
159159
'filelock>=3.14.0;python_version>="3.8"',
160160
'platformdirs>=4.0.0;python_version<"3.8"',
161-
'platformdirs>=4.2.1;python_version>="3.8"',
161+
'platformdirs>=4.2.2;python_version>="3.8"',
162162
'typing-extensions>=4.11.0;python_version>="3.8"',
163163
'parse>=1.20.1',
164164
'parse-type>=0.6.2',
@@ -175,11 +175,11 @@
175175
'h11==0.14.0',
176176
'outcome==1.3.0.post0',
177177
'trio==0.22.2;python_version<"3.8"',
178-
'trio==0.25.0;python_version>="3.8"',
178+
'trio==0.25.1;python_version>="3.8"',
179179
'trio-websocket==0.11.1',
180180
'wsproto==1.2.0',
181181
'selenium==4.11.2;python_version<"3.8"',
182-
'selenium==4.20.0;python_version>="3.8"',
182+
'selenium==4.21.0;python_version>="3.8"',
183183
'cssselect==1.2.0',
184184
"sortedcontainers==2.4.0",
185185
'fasteners==0.19',
@@ -297,7 +297,8 @@
297297
'hpack==4.0.0',
298298
'hyperframe==6.0.1',
299299
'kaitaistruct==0.10',
300-
'pyasn1==0.5.1',
300+
'pyasn1==0.5.1;python_version<"3.8"',
301+
'pyasn1==0.6.0;python_version>="3.8"',
301302
'zstandard==0.22.0',
302303
],
303304
},

0 commit comments

Comments
 (0)