From 61dffa02308c968778383655bc59b895c6baa989 Mon Sep 17 00:00:00 2001 From: teh_coderer Date: Wed, 26 Apr 2023 10:28:10 -0400 Subject: [PATCH 1/3] fix windows pyinstaller subprocess fail if space in path --- poetry.lock | 32 ++++++++++++++++---------------- pyproject.toml | 2 +- requirements-full.txt | 2 +- requirements.txt | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/poetry.lock b/poetry.lock index f3bfb7f6b8d..557d23fba1e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -6461,31 +6461,31 @@ files = [ [[package]] name = "pywry" -version = "0.4.9" +version = "0.5.0" description = "" category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "pywry-0.4.9-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:8db86b4d55683e851537ca6f67b24855af0a9272a465db948b61022b77be1005"}, - {file = "pywry-0.4.9-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:d190284949b46d8bbb77172a51fad54bf4cb166886d56bcb7ad7406f46d79876"}, - {file = "pywry-0.4.9-cp310-none-win_amd64.whl", hash = "sha256:8311c8558e2b8b49a8ad0312adc75ec9d9c8773a3a2e4ffc6984d152ea4e5a64"}, - {file = "pywry-0.4.9-cp311-cp311-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:4d5ae1e6e91e76984d2e105ee00696641d9b889c9bb93d1d8bca0311ee156148"}, - {file = "pywry-0.4.9-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:6996dc35eb8c56178d7b7b06be3ed31f471c5c5d9b8ae3646bcfc5b65659d7e1"}, - {file = "pywry-0.4.9-cp311-none-win_amd64.whl", hash = "sha256:f40613e4eaf122bd97513fc965bedc32fb8f7abb324fa91fcb1d5a4c0a14f3f6"}, - {file = "pywry-0.4.9-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:488d6856e0dc63d8f1d77f999c114c511f32e5792449f9a96cd5028839c2260c"}, - {file = "pywry-0.4.9-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:d5d7788269269be1f43ea306242b72432ea3b45ed0acba6ef787b06b2bb27ad5"}, - {file = "pywry-0.4.9-cp38-none-win_amd64.whl", hash = "sha256:65c99a8b984be78d8420ee037cf705823b95d6b3a8e9cc6b9a237fb4b99e2718"}, - {file = "pywry-0.4.9-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:49e48583a8e8d67af42b30d3663a231bec82a05dc8e9cdd9c5100360fc69152a"}, - {file = "pywry-0.4.9-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:73572e6c22a9d7ac43bce3c00070412e6f6d01884fc70d37ca1c2db6bc7d7546"}, - {file = "pywry-0.4.9-cp39-none-win_amd64.whl", hash = "sha256:b47f1d4e5f42a78e3735e3b54fd9b60c8cb5a80d2928bab1c5190ed03a10f800"}, - {file = "pywry-0.4.9.tar.gz", hash = "sha256:d891a07bc82a12b572095fd66a32b23ca9d956ad35a44d62aa9f3b6a26627b1d"}, + {file = "pywry-0.5.0-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:bba57144a054027084c9b8829fc92a98742b6eeaef895670d0301be103292a18"}, + {file = "pywry-0.5.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:dd5b1806075682dd6a7b9715dad044bf625ac09ea04447a95c2c3af356b68d05"}, + {file = "pywry-0.5.0-cp310-none-win_amd64.whl", hash = "sha256:7dba52d39c156214a04b9f4003b02805c9c3c5ae63cf121dd2174e0f35c4f5a2"}, + {file = "pywry-0.5.0-cp311-cp311-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:169c3732f1fa7066d250b9603d3d6dc4aa67d0b62433f254b596a0fe97afe52f"}, + {file = "pywry-0.5.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:f04cd9d0cebadbaf8fbbec851f24c3d8b0468408514069b8421e4db497fbaffa"}, + {file = "pywry-0.5.0-cp311-none-win_amd64.whl", hash = "sha256:9920a1a4acc8058655075fb52c31f53b1f8438462c8b9947c4f7cd302ced1ae9"}, + {file = "pywry-0.5.0-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:dd40af058a2731037fb53f81d3fa12b014eb5b6110bbc2ab1792a005c5f9bd8c"}, + {file = "pywry-0.5.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:4f39c990feb98be4e4f1d30d4fd750fe7c74f288698ebfff484d3ae0451ffe74"}, + {file = "pywry-0.5.0-cp38-none-win_amd64.whl", hash = "sha256:2959b2ff68b1548958ed4eec6fe0f2ffe4d20120385c8300a5da5e48aef71022"}, + {file = "pywry-0.5.0-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:93a375cb67e7c954460a5025de17bab0a22f3e396e87532ab68dec7a36a2200d"}, + {file = "pywry-0.5.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:0f89efec669a0445b758894bb6b26fdbad82140b0912da45b64d8e7aab0d4d68"}, + {file = "pywry-0.5.0-cp39-none-win_amd64.whl", hash = "sha256:0a54b8435f754c7f2e03e2a04c67bfc2c4da2931488fdd22cf5ae7b78c6f2c2b"}, + {file = "pywry-0.5.0.tar.gz", hash = "sha256:29b594ace5dde2047f0cb167df2cfa7ae76b8adc8c27947f03300cb64517c11e"}, ] [package.dependencies] psutil = ">=5.8.0,<5.9.4" setproctitle = "*" -websockets = ">=11.0.1" +websockets = "*" [package.extras] dev = ["auditwheel", "wheel"] @@ -9656,4 +9656,4 @@ optimization = ["Riskfolio-Lib"] [metadata] lock-version = "2.0" python-versions = "^3.8,<3.11, !=3.9.7" -content-hash = "6d941c794f4d9bbedc714913b3ffc4a7c0882eae8fc569a300d5be152025a32e" +content-hash = "d2bc3a75f2aff5123a842c656d6e8a9d51fa829433dc0cb1a02deb1d5c6967d9" diff --git a/pyproject.toml b/pyproject.toml index 3cb3afeff90..889c4832760 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -101,7 +101,7 @@ jupyterlab-widgets = "^3.0.3" mstarpy = "^0.0.4" packaging = ">=22.0" streamlit = "^1.21.0" -pywry = "^0.4.9" +pywry = "^0.5.0" svglib = "^1.5.0" sparqlwrapper = "^2.0.0" y-py = "!=0.5.5" # Untraceable third level dependency that requires cargo to be built diff --git a/requirements-full.txt b/requirements-full.txt index 3fab7c94895..b4e35ccb566 100644 --- a/requirements-full.txt +++ b/requirements-full.txt @@ -265,7 +265,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.4.9 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" +pywry==0.5.0 ; 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" diff --git a/requirements.txt b/requirements.txt index 750253395a9..9490ac55b3f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -182,7 +182,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.4.9 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" +pywry==0.5.0 ; 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" From 30d5e587765cd239b2221e72254ca2e176416a2f Mon Sep 17 00:00:00 2001 From: teh_coderer Date: Wed, 26 Apr 2023 10:32:26 -0400 Subject: [PATCH 2/3] remove API_IEX_TOKEN --- openbb_terminal/miscellaneous/models/hub_credentials.json | 1 - tests/openbb_terminal/test_keys_controller.py | 1 - 2 files changed, 2 deletions(-) diff --git a/openbb_terminal/miscellaneous/models/hub_credentials.json b/openbb_terminal/miscellaneous/models/hub_credentials.json index 633f70884c2..f302ed75d6e 100644 --- a/openbb_terminal/miscellaneous/models/hub_credentials.json +++ b/openbb_terminal/miscellaneous/models/hub_credentials.json @@ -9,7 +9,6 @@ "API_NEWS_TOKEN": "", "API_CMC_KEY": "", "API_FINNHUB_KEY": "", - "API_IEX_TOKEN": "", "API_SENTIMENTINVESTOR_TOKEN": "", "API_WHALE_ALERT_KEY": "", "API_GLASSNODE_KEY": "", diff --git a/tests/openbb_terminal/test_keys_controller.py b/tests/openbb_terminal/test_keys_controller.py index 451ba653371..eaa416045d0 100644 --- a/tests/openbb_terminal/test_keys_controller.py +++ b/tests/openbb_terminal/test_keys_controller.py @@ -48,7 +48,6 @@ class MockCFG: self.API_TRADIER_TOKEN = kwargs.get("TRADIER", None) self.API_CMC_KEY = kwargs.get("CMC", None) self.API_FINNHUB_KEY = kwargs.get("FINNHUB", None) - self.API_IEX_TOKEN = kwargs.get("IEX", None) self.API_REDDIT_CLIENT_ID = kwargs.get("REDDIT_CLIENT", None) self.API_REDDIT_CLIENT_SECRET = kwargs.get("REDDIT_SECRET", None) self.API_REDDIT_USERNAME = kwargs.get("REDDIT_USERNAME", None) From 915dd1fa41d9548c93801efd7f5c394835a9190e Mon Sep 17 00:00:00 2001 From: teh_coderer Date: Wed, 26 Apr 2023 10:33:26 -0400 Subject: [PATCH 3/3] remove API_SENTIMENTINVESTOR_TOKEN --- openbb_terminal/miscellaneous/models/hub_credentials.json | 1 - tests/openbb_terminal/test_keys_controller.py | 1 - 2 files changed, 2 deletions(-) diff --git a/openbb_terminal/miscellaneous/models/hub_credentials.json b/openbb_terminal/miscellaneous/models/hub_credentials.json index f302ed75d6e..47891a407ab 100644 --- a/openbb_terminal/miscellaneous/models/hub_credentials.json +++ b/openbb_terminal/miscellaneous/models/hub_credentials.json @@ -9,7 +9,6 @@ "API_NEWS_TOKEN": "", "API_CMC_KEY": "", "API_FINNHUB_KEY": "", - "API_SENTIMENTINVESTOR_TOKEN": "", "API_WHALE_ALERT_KEY": "", "API_GLASSNODE_KEY": "", "API_COINGLASS_KEY": "", diff --git a/tests/openbb_terminal/test_keys_controller.py b/tests/openbb_terminal/test_keys_controller.py index eaa416045d0..10c2de4d5cf 100644 --- a/tests/openbb_terminal/test_keys_controller.py +++ b/tests/openbb_terminal/test_keys_controller.py @@ -64,7 +64,6 @@ class MockCFG: self.API_BINANCE_KEY = kwargs.get("BINANCE", None) self.API_BINANCE_SECRET = kwargs.get("BINANCE", None) self.API_BITQUERY_KEY = kwargs.get("BITQUERY", None) - self.API_SENTIMENTINVESTOR_TOKEN = kwargs.get("SI", None) self.API_COINBASE_KEY = kwargs.get("COINBASE", None) self.API_COINBASE_SECRET = kwargs.get("COINBASE", None) self.API_COINBASE_PASS_PHRASE = kwargs.get("COINBASE", None)