mirror of
https://github.com/pyscript/pyscript.git
synced 2025-12-19 18:27:29 -05:00
This is a follow-up of PR #806 and it's a big step forward towards solving issue #763. The basic idea is that at this stage I want to streamline the execution logic and make it as linear and easy to read/understand as possible. The diff is relatively big, but for the most part is just "shuffling code around". Svelte stores: the idea is to eventually kill of them, so that we can remove the dependency on svelte but also to avoid relying on so much global state, which makes things more complicated and error-prone (e.g., we have several issues related to using runtime when it's not ready yet). I killed addInitializer, addPostInitializer and the corresponding svelte stores tada. They are no longer needed since the relevant code is called directly from main.ts. I started to kill the usage of the runtimeLoaded svelte store: instead of relying on a global variable, I want to arrive at the point in which the runtime is passed as a parameter in all places where it's needed: pyscript.ts is now free of global state, but I couldn't kill it yet because it's used heavily by base.ts and pyrepl.ts. I will do it in another PR. Other misc changes: I added sanity checks (and corresponding tests!) which complain if you specify 0 or multiple runtimes. Currently we support having one and only one, so there is no point to pretend otherwise I modified the messages displayed by the loader, to be more informative from the user point of view.
200 lines
5.9 KiB
Python
200 lines
5.9 KiB
Python
import os
|
|
import tarfile
|
|
import tempfile
|
|
|
|
import pytest
|
|
import requests
|
|
|
|
from .support import JsError, PyScriptTest
|
|
|
|
URL = "https://github.com/pyodide/pyodide/releases/download/0.20.0/pyodide-build-0.20.0.tar.bz2"
|
|
TAR_NAME = "pyodide-build-0.20.0.tar.bz2"
|
|
|
|
|
|
@pytest.fixture
|
|
def tar_location(request):
|
|
val = request.config.cache.get("pyodide-0.20-tar", None)
|
|
if val is None:
|
|
response = requests.get(URL, stream=True)
|
|
TMP_DIR = tempfile.mkdtemp()
|
|
TMP_TAR_LOCATION = os.path.join(TMP_DIR, TAR_NAME)
|
|
with open(TMP_TAR_LOCATION, "wb") as f:
|
|
f.write(response.raw.read())
|
|
val = TMP_TAR_LOCATION
|
|
request.config.cache.set("pyodide-0.20-tar", val)
|
|
return val
|
|
|
|
|
|
def unzip(location, extract_to="."):
|
|
file = tarfile.open(name=location, mode="r:bz2")
|
|
file.extractall(path=extract_to)
|
|
|
|
|
|
class TestConfig(PyScriptTest):
|
|
def test_py_config_inline(self):
|
|
self.pyscript_run(
|
|
"""
|
|
<py-config type="toml">
|
|
name = "foobar"
|
|
</py-config>
|
|
|
|
<py-script>
|
|
import js
|
|
config = js.pyscript_get_config()
|
|
js.console.log("config name:", config.name)
|
|
</py-script>
|
|
"""
|
|
)
|
|
assert self.console.log.lines[-1] == "config name: foobar"
|
|
|
|
def test_py_config_external(self):
|
|
pyconfig_toml = """
|
|
name = "app with external config"
|
|
"""
|
|
self.writefile("pyconfig.toml", pyconfig_toml)
|
|
self.pyscript_run(
|
|
"""
|
|
<py-config src="pyconfig.toml" type="toml">
|
|
</py-config>
|
|
|
|
<py-script>
|
|
import js
|
|
config = js.pyscript_get_config()
|
|
js.console.log("config name:", config.name)
|
|
</py-script>
|
|
"""
|
|
)
|
|
assert self.console.log.lines[-1] == "config name: app with external config"
|
|
|
|
# The default pyodide version is 0.21.2 as of writing
|
|
# this test which is newer than the one we are loading below
|
|
# (after downloading locally) -- which is 0.20.0
|
|
|
|
# The test checks if loading a different runtime is possible
|
|
# and that too from a locally downloaded file without needing
|
|
# the use of explicit `indexURL` calculation.
|
|
def test_runtime_config(self, tar_location):
|
|
unzip(
|
|
location=tar_location,
|
|
extract_to=self.tmpdir,
|
|
)
|
|
|
|
self.pyscript_run(
|
|
"""
|
|
<py-config type="json">
|
|
{
|
|
"runtimes": [{
|
|
"src": "/pyodide/pyodide.js",
|
|
"name": "pyodide-0.20.0",
|
|
"lang": "python"
|
|
}]
|
|
}
|
|
</py-config>
|
|
|
|
<py-script>
|
|
import sys, js
|
|
pyodide_version = sys.modules["pyodide"].__version__
|
|
js.console.log("version", pyodide_version)
|
|
pyodide_version
|
|
</py-script>
|
|
""",
|
|
)
|
|
|
|
assert self.console.log.lines == [self.PY_COMPLETE, "version 0.20.0"]
|
|
version = self.page.locator("py-script").inner_text()
|
|
assert version == "0.20.0"
|
|
|
|
def test_invalid_json_config(self):
|
|
with pytest.raises(JsError) as exc:
|
|
self.pyscript_run(
|
|
snippet="""
|
|
<py-config type="json">
|
|
[[
|
|
</py-config>
|
|
"""
|
|
)
|
|
|
|
msg = str(exc.value)
|
|
assert "SyntaxError" in msg
|
|
|
|
def test_invalid_toml_config(self):
|
|
with pytest.raises(JsError) as exc:
|
|
self.pyscript_run(
|
|
snippet="""
|
|
<py-config>
|
|
[[
|
|
</py-config>
|
|
"""
|
|
)
|
|
msg = str(exc)
|
|
assert "<ExceptionInfo JsError" in msg
|
|
|
|
def test_multiple_py_config(self):
|
|
self.pyscript_run(
|
|
"""
|
|
<py-config>
|
|
name = "foobar"
|
|
</py-config>
|
|
|
|
<py-config>
|
|
this is ignored and won't even be parsed
|
|
</py-config>
|
|
|
|
<py-script>
|
|
import js
|
|
config = js.pyscript_get_config()
|
|
js.console.log("config name:", config.name)
|
|
</py-script>
|
|
"""
|
|
)
|
|
div = self.page.wait_for_selector(".py-error")
|
|
expected = (
|
|
"Multiple <py-config> tags detected. Only the first "
|
|
"is going to be parsed, all the others will be ignored"
|
|
)
|
|
assert div.text_content() == expected
|
|
|
|
def test_no_runtimes(self):
|
|
snippet = """
|
|
<py-config type="json">
|
|
{
|
|
"runtimes": []
|
|
}
|
|
</py-config>
|
|
"""
|
|
self.pyscript_run(snippet, wait_for_pyscript=False)
|
|
div = self.page.wait_for_selector(".py-error")
|
|
assert div.text_content() == "Fatal error: config.runtimes is empty"
|
|
|
|
def test_multiple_runtimes(self):
|
|
snippet = """
|
|
<py-config type="json">
|
|
{
|
|
"runtimes": [
|
|
{
|
|
"src": "https://cdn.jsdelivr.net/pyodide/v0.21.2/full/pyodide.js",
|
|
"name": "pyodide-0.21.2",
|
|
"lang": "python"
|
|
},
|
|
{
|
|
"src": "http://...",
|
|
"name": "this will be ignored",
|
|
"lang": "this as well"
|
|
}
|
|
]
|
|
}
|
|
</py-config>
|
|
|
|
<py-script>
|
|
import js
|
|
js.console.log("hello world");
|
|
</py-script>
|
|
"""
|
|
self.pyscript_run(snippet)
|
|
div = self.page.wait_for_selector(".py-error")
|
|
expected = (
|
|
"Multiple runtimes are not supported yet. Only the first will be used"
|
|
)
|
|
assert div.text_content() == expected
|
|
assert self.console.log.lines[-1] == "hello world"
|