Skip to content

Commit 119afcf

Browse files
committed
v0.10.6 release candidate (#214)
* v0.10.6 release candidate * Address feedback
1 parent f57cd7f commit 119afcf

File tree

5 files changed

+37
-9
lines changed

5 files changed

+37
-9
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "shinylive",
4-
"version": "0.10.5",
4+
"version": "0.10.6",
55
"description": "Run Shiny applications with R or Python running in the browser.",
66
"main": "index.js",
77
"repository": {

packages/py-shiny

Submodule py-shiny updated 293 files

scripts/pyodide_packages.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,14 @@
100100
"palmerpenguins": ["setuptools"],
101101
}
102102

103+
# Some packages may have a circular dependency. For example, shiny (v1.5.0) depends on
104+
# shinychat, and shinychat depends on shiny. Python is okay with this (as long
105+
# as the imports aren't circular at runtime), but pyodide has trouble with it.
106+
# This hack breaks the circularity by removing shiny from shinychat's dependencies,
107+
# which is okay since shinylive will always come with shiny already installed.
108+
OMIT_DEPENDENCIES = {
109+
"shinychat": ["shiny"],
110+
}
103111

104112
# =============================================
105113
# Data structures used in our shinylive_requirements.json
@@ -638,6 +646,11 @@ def update_pyodide_pyodide_lock_json():
638646
for name in EXTRA_DEPENDENCIES:
639647
pyodide_packages["packages"][name]["depends"].extend(EXTRA_DEPENDENCIES[name])
640648

649+
print("Removing circular dependencies")
650+
for key, val in OMIT_DEPENDENCIES.items():
651+
depends = set(pyodide_packages["packages"][key]["depends"])
652+
pyodide_packages["packages"][key]["depends"] = list(depends.difference(val))
653+
641654
print("Writing pyodide/pyodide-lock.json")
642655
with open(pyodide_lock_json_file, "w") as f:
643656
json.dump(pyodide_packages, f)

shinylive_lock.json

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
},
1616
"shiny": {
1717
"name": "shiny",
18-
"version": "1.4.0",
19-
"filename": "shiny-1.4.0-py3-none-any.whl",
18+
"version": "1.5.0",
19+
"filename": "shiny-1.5.0-py3-none-any.whl",
2020
"sha256": null,
2121
"url": null,
2222
"depends": [
@@ -26,11 +26,12 @@
2626
{"name": "markdown-it-py", "specs": [[">=", "1.1.0"]]},
2727
{"name": "mdit-py-plugins", "specs": [[">=", "0.3.0"]]},
2828
{"name": "linkify-it-py", "specs": [[">=", "1.0"]]},
29-
{"name": "appdirs", "specs": [[">=", "1.4.4"]]},
29+
{"name": "platformdirs", "specs": [[">=", "2.1.0"]]},
3030
{"name": "asgiref", "specs": [[">=", "3.5.2"]]},
3131
{"name": "packaging", "specs": [[">=", "20.9"]]},
3232
{"name": "narwhals", "specs": [[">=", "1.10.0"]]},
33-
{"name": "orjson", "specs": [[">=", "3.10.7"]]}
33+
{"name": "orjson", "specs": [[">=", "3.10.7"]]},
34+
{"name": "shinychat", "specs": [[">=", "0.1.0"]]}
3435
],
3536
"imports": [
3637
"shiny"
@@ -44,7 +45,7 @@
4445
"url": null,
4546
"depends": [
4647
{"name": "ipywidgets", "specs": [[">=", "7.6.5"]]},
47-
{"name": "jupyter-core", "specs": []},
48+
{"name": "jupyter_core", "specs": []},
4849
{"name": "shiny", "specs": [[">=", "0.6.1.9005"]]},
4950
{"name": "python-dateutil", "specs": [[">=", "2.8.2"]]},
5051
{"name": "anywidget", "specs": []}
@@ -562,5 +563,19 @@
562563
"imports": [
563564
"psygnal"
564565
]
566+
},
567+
"shinychat": {
568+
"name": "shinychat",
569+
"version": "0.2.8",
570+
"filename": "shinychat-0.2.8-py3-none-any.whl",
571+
"sha256": "6742a2354257280458269a8b5675f1254e5583be34b6eb1a626de44c0323286a",
572+
"url": "https://files.pythonhosted.org/packages/16/01/8658eaffa920f4c621f05acc42ea98248147706079287b3a7ab4e47e1ece/shinychat-0.2.8-py3-none-any.whl",
573+
"depends": [
574+
{"name": "htmltools", "specs": [[">=", "0.6.0"]]},
575+
{"name": "shiny", "specs": [[">=", "1.4.0"]]}
576+
],
577+
"imports": [
578+
"shinychat"
579+
]
565580
}
566581
}

0 commit comments

Comments
 (0)