Skip to content

Commit a9605ae

Browse files
authored
Merge pull request #4330 from seleniumbase/fix-unzip-in-powershell
Fix unzip in powershell
2 parents a0aceea + 3a38776 commit a9605ae

File tree

4 files changed

+17
-35
lines changed

4 files changed

+17
-35
lines changed

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pip>=26.0.1
2-
packaging>=26.0
2+
packaging>=26.1
33
setuptools~=70.2;python_version<"3.10"
44
setuptools>=82.0.1;python_version>="3.10"
55
wheel>=0.46.3
@@ -9,7 +9,7 @@ exceptiongroup>=1.3.1
99
websockets~=15.0.1;python_version<"3.10"
1010
websockets>=16.0;python_version>="3.10"
1111
filelock~=3.19.1;python_version<"3.10"
12-
filelock>=3.25.2;python_version>="3.10"
12+
filelock>=3.28.0;python_version>="3.10"
1313
fasteners>=0.20
1414
mycdp>=1.3.7
1515
pynose>=1.5.5

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__ = "4.48.1"
2+
__version__ = "4.48.2"

seleniumbase/console_scripts/sb_install.py

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,17 +1324,11 @@ def main(override=None, intel_for_uc=None, force_uc=None):
13241324
["unzip", zip_file_path, "-d", downloads_folder]
13251325
)
13261326
elif IS_WINDOWS:
1327-
subprocess.run(
1328-
[
1329-
"powershell",
1330-
"Expand-Archive",
1331-
"-Path",
1332-
zip_file_path,
1333-
"-DestinationPath",
1334-
downloads_folder,
1335-
"-Force",
1336-
]
1327+
cmd = (
1328+
f'Expand-Archive -Path "{zip_file_path}" '
1329+
f'-DestinationPath "{downloads_folder}" -Force'
13371330
)
1331+
subprocess.run(["powershell", "-Command", cmd])
13381332
else:
13391333
zip_ref.extractall(downloads_folder)
13401334
zip_ref.close()
@@ -1366,17 +1360,11 @@ def main(override=None, intel_for_uc=None, force_uc=None):
13661360
["unzip", zip_file_path, "-d", downloads_folder]
13671361
)
13681362
elif IS_WINDOWS:
1369-
subprocess.run(
1370-
[
1371-
"powershell",
1372-
"Expand-Archive",
1373-
"-Path",
1374-
zip_file_path,
1375-
"-DestinationPath",
1376-
downloads_folder,
1377-
"-Force",
1378-
]
1363+
cmd = (
1364+
f'Expand-Archive -Path "{zip_file_path}" '
1365+
f'-DestinationPath "{downloads_folder}" -Force'
13791366
)
1367+
subprocess.run(["powershell", "-Command", cmd])
13801368
else:
13811369
zip_ref.extractall(downloads_folder)
13821370
zip_ref.close()
@@ -1408,17 +1396,11 @@ def main(override=None, intel_for_uc=None, force_uc=None):
14081396
["unzip", zip_file_path, "-d", downloads_folder]
14091397
)
14101398
elif IS_WINDOWS:
1411-
subprocess.run(
1412-
[
1413-
"powershell",
1414-
"Expand-Archive",
1415-
"-Path",
1416-
zip_file_path,
1417-
"-DestinationPath",
1418-
downloads_folder,
1419-
"-Force",
1420-
]
1399+
cmd = (
1400+
f'Expand-Archive -Path "{zip_file_path}" '
1401+
f'-DestinationPath "{downloads_folder}" -Force'
14211402
)
1403+
subprocess.run(["powershell", "-Command", cmd])
14221404
else:
14231405
zip_ref.extractall(downloads_folder)
14241406
zip_ref.close()

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
python_requires=">=3.9",
148148
install_requires=[
149149
'pip>=26.0.1',
150-
'packaging>=26.0',
150+
'packaging>=26.1',
151151
'setuptools~=70.2;python_version<"3.10"', # Newer ones had issues
152152
'setuptools>=82.0.1;python_version>="3.10"',
153153
'wheel>=0.46.3',
@@ -157,7 +157,7 @@
157157
'websockets~=15.0.1;python_version<"3.10"',
158158
'websockets>=16.0;python_version>="3.10"',
159159
'filelock~=3.19.1;python_version<"3.10"',
160-
'filelock>=3.25.2;python_version>="3.10"',
160+
'filelock>=3.28.0;python_version>="3.10"',
161161
'fasteners>=0.20',
162162
'mycdp>=1.3.7',
163163
'pynose>=1.5.5',

0 commit comments

Comments
 (0)