From d823e91e4b1a9facf4bec4834e570ae02190bafb Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Fri, 2 Jun 2023 10:01:39 -0600 Subject: [PATCH] Update pytest-pyodide to 0.52 (#3859) --- .pre-commit-config.yaml | 2 +- pyodide-build/setup.cfg | 2 +- requirements.txt | 2 +- src/tests/test_package_loading.py | 10 ++++++++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9145f59d8..9db1f62cb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -69,7 +69,7 @@ repos: hooks: - id: mypy files: ^(packages/.*/src|src|pyodide-build/pyodide_build) - exclude: (setup.py|src/tests|conftest.py|packages/.*/test) + exclude: (setup.py|.*test.*) args: [] additional_dependencies: &mypy-deps - packaging diff --git a/pyodide-build/setup.cfg b/pyodide-build/setup.cfg index a6511c423..5488e87cb 100644 --- a/pyodide-build/setup.cfg +++ b/pyodide-build/setup.cfg @@ -60,7 +60,7 @@ pyodide.cli = [options.extras_require] test = pytest - pytest-pyodide==0.23.2 + pytest-pyodide==0.52.0 deploy = boto3 moto diff --git a/requirements.txt b/requirements.txt index 71f75c1f7..10f5a5205 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,4 +12,4 @@ pytest-cov pytest-httpserver pytest-benchmark - pytest-pyodide==0.23.2 + pytest-pyodide==0.52.0 diff --git a/src/tests/test_package_loading.py b/src/tests/test_package_loading.py index 51ef58df5..951babc26 100644 --- a/src/tests/test_package_loading.py +++ b/src/tests/test_package_loading.py @@ -67,7 +67,7 @@ def test_load_relative_url( url, port, _ = web_server_main test_html = (ROOT_PATH / "src/templates/test.html").read_text() test_html = test_html.replace("./pyodide.js", f"http://{url}:{port}/pyodide.js") - (tmp_path / "test.html").write_text(test_html) + (tmp_path / "test_temp.html").write_text(test_html) pytz_wheel = get_pytz_wheel_name() pytz1_wheel = pytz_wheel.replace("pytz", "pytz1") shutil.copy(DIST_PATH / pytz_wheel, tmp_path / pytz1_wheel) @@ -76,12 +76,18 @@ def test_load_relative_url( request, runtime, web_server, - load_pyodide=True, + load_pyodide=False, browsers=playwright_browsers, script_type="classic", ) as selenium, set_webdriver_script_timeout( selenium, script_timeout=parse_driver_timeout(request.node) ): + if selenium.browser != "node": + selenium.goto(f"http://{url}:{web_server[1]}/test_temp.html") + selenium.load_pyodide() + selenium.initialize_pyodide() + selenium.save_state() + selenium.restore_state() if selenium.browser == "node": selenium.run_js(f"process.chdir('{tmp_path.resolve()}')") selenium.load_package(pytz1_wheel)