Skip to content

Commit 487e4cc

Browse files
committed
Merge remote-tracking branch 'upstream/main' into agents/roll-to-1600-alpha-17780750
# Conflicts: # playwright/async_api/_generated.py # playwright/sync_api/_generated.py
2 parents 5f8df37 + 873c5c7 commit 487e4cc

24 files changed

Lines changed: 3512 additions & 1113 deletions

.azure-pipelines/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ extends:
6060
targetPath: $(Build.ArtifactStagingDirectory)/esrp-build
6161
steps:
6262
- checkout: none
63-
- task: EsrpRelease@9
63+
- task: EsrpRelease@11
6464
inputs:
6565
connectedservicename: 'Playwright-ESRP-PME'
6666
usemanagedidentity: true

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: Lint
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v5
24+
- uses: actions/checkout@v6
2525
- name: Set up Python
2626
uses: actions/setup-python@v6
2727
with:
@@ -91,7 +91,7 @@ jobs:
9191
browser: chromium
9292
runs-on: ${{ matrix.os }}
9393
steps:
94-
- uses: actions/checkout@v5
94+
- uses: actions/checkout@v6
9595
- name: Set up Python
9696
uses: actions/setup-python@v6
9797
with:
@@ -138,7 +138,7 @@ jobs:
138138
browser-channel: msedge
139139
runs-on: ${{ matrix.os }}
140140
steps:
141-
- uses: actions/checkout@v5
141+
- uses: actions/checkout@v6
142142
- name: Set up Python
143143
uses: actions/setup-python@v6
144144
with:
@@ -181,11 +181,11 @@ jobs:
181181
# where the default shell is pwsh and skips the activation hooks.
182182
shell: bash -el {0}
183183
steps:
184-
- uses: actions/checkout@v5
184+
- uses: actions/checkout@v6
185185
with:
186186
fetch-depth: 0
187187
- name: Get conda
188-
uses: conda-incubator/setup-miniconda@v3
188+
uses: conda-incubator/setup-miniconda@v4
189189
with:
190190
python-version: '3.12'
191191
channels: conda-forge
@@ -202,7 +202,7 @@ jobs:
202202
run:
203203
working-directory: examples/todomvc/
204204
steps:
205-
- uses: actions/checkout@v5
205+
- uses: actions/checkout@v6
206206
- name: Set up Python
207207
uses: actions/setup-python@v6
208208
with:

.github/workflows/publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
runs-on: ${{ matrix.os }}
2323
defaults:
2424
run:
25-
# Required for conda-incubator/setup-miniconda@v3
25+
# Required for conda-incubator/setup-miniconda@v4
2626
shell: bash -el {0}
2727
steps:
28-
- uses: actions/checkout@v5
28+
- uses: actions/checkout@v6
2929
with:
3030
fetch-depth: 0
3131
- name: Get conda
32-
uses: conda-incubator/setup-miniconda@v3
32+
uses: conda-incubator/setup-miniconda@v4
3333
with:
3434
python-version: '3.12'
3535
channels: conda-forge

.github/workflows/publish_docker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
contents: read # This is required for actions/checkout to succeed
1616
environment: Docker
1717
steps:
18-
- uses: actions/checkout@v5
18+
- uses: actions/checkout@v6
1919
- name: Azure login
20-
uses: azure/login@v2
20+
uses: azure/login@v3
2121
with:
2222
client-id: ${{ secrets.AZURE_DOCKER_CLIENT_ID }}
2323
tenant-id: ${{ secrets.AZURE_DOCKER_TENANT_ID }}
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
python-version: "3.10"
3131
- name: Set up Docker QEMU for arm64 docker builds
32-
uses: docker/setup-qemu-action@v3
32+
uses: docker/setup-qemu-action@v4
3333
with:
3434
platforms: arm64
3535
- name: Install dependencies & browsers

.github/workflows/test_docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- ubuntu-24.04
3131
- ubuntu-24.04-arm
3232
steps:
33-
- uses: actions/checkout@v5
33+
- uses: actions/checkout@v6
3434
- name: Set up Python
3535
uses: actions/setup-python@v6
3636
with:

local-requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ asyncio-atexit==1.0.1
22
autobahn==23.1.2
33
black==25.1.0
44
build==1.3.0
5-
flake8==7.2.0
5+
flake8==7.3.0
66
mypy==1.17.1
77
objgraph==3.6.2
88
Pillow==11.3.0
99
pixelmatch==0.3.0
1010
pre-commit==3.5.0
11-
pyOpenSSL==25.1.0
11+
pyOpenSSL==26.0.0
1212
pytest==8.4.1
1313
pytest-asyncio==1.1.0
14-
pytest-cov==6.3.0
14+
pytest-cov==7.1.0
1515
pytest-repeat==0.9.4
1616
pytest-rerunfailures==15.1
1717
pytest-timeout==2.4.0
@@ -20,4 +20,4 @@ requests==2.32.5
2020
service_identity==24.2.0
2121
twisted==25.5.0
2222
types-pyOpenSSL==24.1.0.20240722
23-
types-requests==2.32.4.20250809
23+
types-requests==2.32.4.20260107

playwright/_impl/_browser_type.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,8 @@ def normalize_launch_params(params: Dict) -> None:
358358
if params["ignoreDefaultArgs"] is True:
359359
params["ignoreAllDefaultArgs"] = True
360360
del params["ignoreDefaultArgs"]
361+
elif params["ignoreDefaultArgs"] is False:
362+
del params["ignoreDefaultArgs"]
361363
if "executablePath" in params:
362364
params["executablePath"] = str(Path(params["executablePath"]))
363365
if "downloadsPath" in params:

playwright/_impl/_helper.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
import asyncio
15+
import datetime
1516
import math
1617
import os
1718
import re
@@ -574,3 +575,13 @@ def is_file_payload(value: Optional[Any]) -> bool:
574575

575576
def is_textual_mime_type(mime_type: str) -> bool:
576577
return bool(TEXTUAL_MIME_TYPE.match(mime_type))
578+
579+
580+
def to_milliseconds(
581+
value: Union[float, datetime.timedelta, None],
582+
) -> Optional[float]:
583+
if value is None:
584+
return None
585+
if isinstance(value, datetime.timedelta):
586+
return value / datetime.timedelta(milliseconds=1)
587+
return value

0 commit comments

Comments
 (0)