Skip to content

Commit 8efae1b

Browse files
diemoldiemol
committed
2 parents bfcda90 + 65b97fc commit 8efae1b

9 files changed

Lines changed: 35 additions & 25 deletions

File tree

‎py/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ py_wheel(
215215
python_requires = ">=3.7",
216216
python_tag = "py3",
217217
requires = [
218-
"urllib3[socks]~=1.26",
218+
"urllib3[socks]>=1.26,<3",
219219
"trio~=0.17",
220220
"trio-websocket~=0.9",
221221
"certifi>=2021.10.8",

‎py/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ pytest-trio==0.8.0
2727
sniffio==1.2.0
2828
sortedcontainers==2.4.0
2929
toml==0.10.2
30-
trio==0.20.0
30+
trio>=0.20.0
3131
trio-websocket==0.9.2
32-
urllib3[socks]==1.26.9
32+
urllib3[socks]==2.0.2
3333
wsproto==1.1.0
3434
zipp==3.8.0

‎py/requirements_lock.txt‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ async-generator==1.10 \
99
--hash=sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144
1010
# via
1111
# -r py/requirements.txt
12-
# pytest-trio
1312
# trio
1413
# trio-websocket
1514
attrs==21.4.0 \
@@ -132,7 +131,9 @@ debugpy==1.6.0 \
132131
exceptiongroup==1.1.1 \
133132
--hash=sha256:232c37c63e4f682982c8b6459f33a8981039e5fb8756b2074364e5055c498c9e \
134133
--hash=sha256:d484c3090ba2889ae2928419117447a14daf3c1231d5e30d0aae34f354f01785
135-
# via pytest
134+
# via
135+
# pytest
136+
# trio
136137
h11==0.13.0 \
137138
--hash=sha256:70813c1135087a248a4d38cc0e1a0181ffab2188141a93eaf567940c3957ff06 \
138139
--hash=sha256:8ddd78563b633ca55346c8cd41ec0af27d3c79931828beffb46ce70a379e7442
@@ -282,12 +283,13 @@ pytest-instafail==0.4.2 \
282283
--hash=sha256:19273fdf3f0f9a1cb4b7a0bc8aa1bdaaf6b0f62a681b693d5eca4626abc99782 \
283284
--hash=sha256:1ec440a177be89a9ed2759dade8e1f7a2b95bac74ae81dc91318d309bf4ebd4f
284285
# via -r py/requirements.txt
285-
pytest-mock==3.7.0 \
286-
--hash=sha256:5112bd92cc9f186ee96e1a92efc84969ea494939c3aead39c50f421c4cc69534 \
287-
--hash=sha256:6cff27cec936bf81dc5ee87f07132b807bcda51106b5ec4b90a04331cba76231
286+
pytest-mock==3.10.0 \
287+
--hash=sha256:f4c973eeae0282963eb293eb173ce91b091a79c1334455acfac9ddee8a1c784b \
288+
--hash=sha256:fbbdb085ef7c252a326fd8cdcac0aa3b1333d8811f131bdcc701002e1be7ed4f
288289
# via -r py/requirements.txt
289-
pytest-trio==0.7.0 \
290-
--hash=sha256:c01b741819aec2c419555f28944e132d3c711dae1e673d63260809bf92c30c31
290+
pytest-trio==0.8.0 \
291+
--hash=sha256:8363db6336a79e6c53375a2123a41ddbeccc4aa93f93788651641789a56fb52e \
292+
--hash=sha256:e6a7e7351ae3e8ec3f4564d30ee77d1ec66e1df611226e5618dbb32f9545c841
291293
# via -r py/requirements.txt
292294
sniffio==1.2.0 \
293295
--hash=sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663 \
@@ -309,9 +311,9 @@ tomli==2.0.1 \
309311
--hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
310312
--hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
311313
# via pytest
312-
trio==0.20.0 \
313-
--hash=sha256:670a52d3115d0e879e1ac838a4eb999af32f858163e3a704fe4839de2a676070 \
314-
--hash=sha256:fb2d48e4eab0dfb786a472cd514aaadc71e3445b203bc300bad93daa75d77c1a
314+
trio==0.22.0 \
315+
--hash=sha256:ce68f1c5400a47b137c5a4de72c7c901bd4e7a24fbdebfe9b41de8c6c04eaacf \
316+
--hash=sha256:f1dd0780a89bfc880c7c7994519cb53f62aacb2c25ff487001c0052bd721cdf0
315317
# via
316318
# -r py/requirements.txt
317319
# pytest-trio
@@ -320,9 +322,9 @@ trio-websocket==0.9.2 \
320322
--hash=sha256:5b558f6e83cc20a37c3b61202476c5295d1addf57bd65543364e0337e37ed2bc \
321323
--hash=sha256:a3d34de8fac26023eee701ed1e7bf4da9a8326b61a62934ec9e53b64970fd8fe
322324
# via -r py/requirements.txt
323-
urllib3[socks]==1.26.9 \
324-
--hash=sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14 \
325-
--hash=sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e
325+
urllib3[socks]==2.0.2 \
326+
--hash=sha256:61717a1095d7e155cdb737ac7bb2f4324a858a1e2e6466f6d03ff630ca68d3cc \
327+
--hash=sha256:d055c2f9d38dc53c808f6fdc8eab7360b6fdbbde02340ed25cfbcd817c62469e
326328
# via -r py/requirements.txt
327329
wsproto==1.1.0 \
328330
--hash=sha256:2218cb57952d90b9fca325c0dcfb08c3bda93e8fd8070b0a17f048e2e47a521b \

‎py/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
'selenium.webdriver.support', ],
7272
'include_package_data': True,
7373
'install_requires': [
74-
"urllib3[socks]~=1.26",
74+
"urllib3[socks]>=1.26,<3",
7575
"trio~=0.17",
7676
"trio-websocket~=0.9",
7777
"certifi>=2021.10.8",

‎rb/Gemfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ source 'https://rubygems.org'
44
Dir["#{__dir__}/*.gemspec"].each do |spec|
55
gemspec name: File.basename(spec, '.gemspec')
66
end
7+
8+
gem 'debug', '~> 1.7', require: false, platforms: %i[mri mingw x64_mingw]

‎rb/Gemfile.lock‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ GEM
2222
diff-lcs (1.5.0)
2323
hashdiff (1.0.1)
2424
io-console (0.6.0)
25-
io-console (0.6.0-java)
2625
irb (1.6.4)
2726
reline (>= 0.3.0)
2827
json (2.6.3)

‎rb/selenium-webdriver.gemspec‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ Gem::Specification.new do |s|
5353
s.add_runtime_dependency 'rubyzip', ['>= 1.2.2', '< 3.0']
5454
s.add_runtime_dependency 'websocket', ['~> 1.0']
5555

56-
s.add_development_dependency 'debug', ['~> 1.7']
5756
s.add_development_dependency 'rack', ['~> 2.0']
5857
s.add_development_dependency 'rspec', ['~> 3.0']
5958
s.add_development_dependency 'rubocop', ['~> 1.42']

‎rb/spec/integration/selenium/webdriver/spec_helper.rb‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@
1717
# specific language governing permissions and limitations
1818
# under the License.
1919

20-
require 'debug/session'
21-
DEBUGGER__::CONFIG[:fork_mode] = :parent
22-
DEBUGGER__.open(nonstop: true)
20+
begin
21+
require 'debug/session'
22+
DEBUGGER__::CONFIG[:fork_mode] = :parent
23+
DEBUGGER__.open(nonstop: true)
24+
rescue LoadError
25+
# not supported on JRuby and TruffleRuby
26+
end
2327

2428
require 'rubygems'
2529
require 'time'

‎rb/spec/unit/selenium/webdriver/spec_helper.rb‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@
1717
# specific language governing permissions and limitations
1818
# under the License.
1919

20-
require 'debug/session'
21-
DEBUGGER__::CONFIG[:fork_mode] = :parent
22-
DEBUGGER__.open(nonstop: true)
20+
begin
21+
require 'debug/session'
22+
DEBUGGER__::CONFIG[:fork_mode] = :parent
23+
DEBUGGER__.open(nonstop: true)
24+
rescue LoadError
25+
# not supported on JRuby and TruffleRuby
26+
end
2327

2428
require 'rubygems'
2529
require 'time'

0 commit comments

Comments
 (0)