Merge branch 'develop' into release/3.0.1

2026-10-28 21:12:16 +00:00 · 2023-05-15 19:39:18 -04:00
parent 1cf8ef246d 6757e265a0
commit 95e97c6e35
5 changed files with 25 additions and 25 deletions
--- a/openbb_terminal/core/plots/backend.py
+++ b/openbb_terminal/core/plots/backend.py
@@ -203,7 +203,7 @@ class Backend(PyWry):
        json_data.update(self.get_json_update(command_location))

        outgoing = dict(
-            html_path=self.get_plotly_html(),
+            html=self.get_plotly_html(),
            json_data=json_data,
            export_image=export_image,
            **self.get_kwargs(command_location),
@@ -300,7 +300,7 @@ class Backend(PyWry):
        )

        outgoing = dict(
-            html_path=self.get_table_html(),
+            html=self.get_table_html(),
            json_data=json.dumps(json_data),
            width=width,
            height=self.HEIGHT - 100,
@@ -335,7 +335,7 @@ class Backend(PyWry):
        </script>
        """
        outgoing = dict(
-            html_str=script,
+            html=script,
            **self.get_kwargs(title),
            width=width or self.WIDTH,
            height=height or self.HEIGHT,
@@ -359,7 +359,7 @@ class Backend(PyWry):
        """Override to check if isatty."""
        if self.isatty:
            message = (
-                "[bold red]PyWry version 0.5.5 or higher is required to use the "
+                "[bold red]PyWry version 0.5.6 or higher is required to use the "
                "OpenBB Plots backend.[/]\n"
                "[yellow]Please update pywry with 'pip install pywry --upgrade'[/]"
            )
@@ -374,7 +374,7 @@ class Backend(PyWry):

                PyWry.__version__ = pywry_version  # pylint: disable=W0201

-            if version.parse(PyWry.__version__) < version.parse("0.5.5"):
+            if version.parse(PyWry.__version__) < version.parse("0.5.6"):
                console.print(message)
                self.max_retries = 0  # pylint: disable=W0201
                return
@@ -385,7 +385,7 @@ class Backend(PyWry):
        if reset:
            self.max_retries = 50  # pylint: disable=W0201

-        super().close(reset)
+        super().close()


 async def download_plotly_js():
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.4.2 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.4.0 and should not be changed by hand.

 [[package]]
 name = "absl-py"
@@ -6498,25 +6498,25 @@ files = [

 [[package]]
 name = "pywry"
-version = "0.5.5"
+version = "0.5.8"
 description = ""
 category = "main"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pywry-0.5.5-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:f04d1d4aa997603f274682468b36c45684adb15a15d55acba2fcd257ab4c1099"},
-    {file = "pywry-0.5.5-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:132f13717ee07be3e46dfa555771483f0b4680ae0e9223df65211edae67de98e"},
-    {file = "pywry-0.5.5-cp310-none-win_amd64.whl", hash = "sha256:f616848417602ff7efe4195ee5f5a90e7a8815a318187c104f4e79b00a5554a5"},
-    {file = "pywry-0.5.5-cp311-cp311-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:64bfc85c926a27cb694b5638b974d4ac3d9315ceb81ba48c90f4252a22c21869"},
-    {file = "pywry-0.5.5-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:cacf22c675a0c7e701a18c4f7d8323cc563696bbcb0dcc8154e80ba19541abbb"},
-    {file = "pywry-0.5.5-cp311-none-win_amd64.whl", hash = "sha256:448472a0f2549c6c1a56862ff69c552d71e82af51d056dec58ab635da65f1140"},
-    {file = "pywry-0.5.5-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:83da0b5c0c3f6af10ed3b21e5dc469ceae5844f61d40fb9ae8b32db5e8cb7a22"},
-    {file = "pywry-0.5.5-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:4c04d137dde93c58998d6ca0b9343be68fa4f89fb12ec89e0f090b9de8b11072"},
-    {file = "pywry-0.5.5-cp38-none-win_amd64.whl", hash = "sha256:423d4d1e0d62e6d7019d5be517c2ea846b2d3f3ed47970436d8b7ea1c9fcec5d"},
-    {file = "pywry-0.5.5-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:93ddd0a79a1988c588c2fa1bfd7926cdedd5b2d57f6e4ea89d0edb708dacd63c"},
-    {file = "pywry-0.5.5-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:87d9e2f44d6e56d958e458234e41a4eeec496f8f98b3cc1d1c36535ceb71cf27"},
-    {file = "pywry-0.5.5-cp39-none-win_amd64.whl", hash = "sha256:4513b5b9880932fabbf0a4d853d6d030948df3867b944892ebd55c6bb5537153"},
-    {file = "pywry-0.5.5.tar.gz", hash = "sha256:d2ba7d2ca6587917a61b4fc4adb5b707e07e02cc240082e0d4a199e3282400d2"},
+    {file = "pywry-0.5.8-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:4c3c8688ba6c50a5ccea78f9500ee28afb02b712f945b55e2c79b96eb28e86c1"},
+    {file = "pywry-0.5.8-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:ed5761372493935b94503ff80e02b8c357b536abeca6e83f6574a3ec6ff994de"},
+    {file = "pywry-0.5.8-cp310-none-win_amd64.whl", hash = "sha256:1e6a18d45bc7979980718f44850656914b52722581279cb1fda93b530a4c2116"},
+    {file = "pywry-0.5.8-cp311-cp311-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:27992ff19ea7e066d7d7a254f78fd6c10f4fd3af10599871261b907f34aedd85"},
+    {file = "pywry-0.5.8-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:5ec7e7d9ba764af19cf2b9b96a6b2cae5192f68039739fb4c763d4fc569ecc86"},
+    {file = "pywry-0.5.8-cp311-none-win_amd64.whl", hash = "sha256:e934d97680249be5e337b131fc424faaefc80dadd8b143a48356138b2da5b9a6"},
+    {file = "pywry-0.5.8-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:368edec5aebb302e81066a9dd2734e3c3d40634bb398e506045a9b794c776679"},
+    {file = "pywry-0.5.8-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:94d6a61d6bcf47de415e0665c3b8aaf9c4fa4f4faa5363ac28a86ca01ee3a3e9"},
+    {file = "pywry-0.5.8-cp38-none-win_amd64.whl", hash = "sha256:e2a7388c804f1604574cbe25078c9736bc293d3b2a00fc1159a2977406ad039b"},
+    {file = "pywry-0.5.8-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:20c81936e5ce356bfa7c7a307ad0dd32ca05e47c14f1a5cdc699364e0c2da6a5"},
+    {file = "pywry-0.5.8-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:4c6bb77acef0b6c2ec56364520771ce7d561c2b4a9de9eddc4c448673e9d3f31"},
+    {file = "pywry-0.5.8-cp39-none-win_amd64.whl", hash = "sha256:b36800fdaf9f603eb6fb79e93205cc89fb3375c5a68ecdf968f2a3adbeefa923"},
+    {file = "pywry-0.5.8.tar.gz", hash = "sha256:568787b1c62f39b4450e15a44c653874f5a22f4ab6b9165a7cb7eeef14bc6a1d"},
 ]

 [package.dependencies]
@@ -9689,4 +9689,4 @@ optimization = ["Riskfolio-Lib"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.8,<3.11, !=3.9.7"
-content-hash = "841e7a9ecf473175234c5f05db6f7e7d61d3e3b7982a37e7c90158fa26dd8861"
+content-hash = "2e796550ac11affe0a511a8f7ff373de07a7b390bbaada9659fb459bb2b2d8ef"
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -101,7 +101,7 @@ jupyterlab-widgets = "^3.0.3"
 mstarpy = "^0.0.4"
 packaging = ">=22.0"
 streamlit = "^1.22.0"
-pywry = "^0.5.5"
+pywry = "^0.5.8"
 svglib = "^1.5.0"
 sparqlwrapper = "^2.0.0"
 y-py = "!=0.5.5"  # Untraceable third level dependency that requires cargo to be built
--- a/requirements-full.txt
+++ b/requirements-full.txt
@@ -267,7 +267,7 @@ pytz==2022.7.1 ; python_version >= "3.8" and python_full_version != "3.9.7" and
 pywin32-ctypes==0.2.0 ; python_version >= "3.8" and python_version < "3.11" and python_full_version != "3.9.7" and sys_platform == "win32"
 pywin32==305 ; sys_platform == "win32" and platform_python_implementation != "PyPy" and python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11"
 pywinpty==2.0.10 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" and os_name == "nt"
-pywry==0.5.5 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11"
+pywry==0.5.8 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11"
 pyyaml==6.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11"
 pyzmq==25.0.1 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11"
 qdldl==0.1.5.post3 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11"
--- a/requirements.txt
+++ b/requirements.txt
@@ -184,7 +184,7 @@ pytz-deprecation-shim==0.1.0.post0 ; python_version >= "3.8" and python_full_ver
 pytz==2022.7.1 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11"
 pywin32==305 ; sys_platform == "win32" and platform_python_implementation != "PyPy" and python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11"
 pywinpty==2.0.10 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" and os_name == "nt"
-pywry==0.5.5 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11"
+pywry==0.5.8 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11"
 pyyaml==6.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11"
 pyzmq==25.0.1 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11"
 quandl==3.7.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11"