From 15de34b03bb5935318653ac0e28747582dd2d113 Mon Sep 17 00:00:00 2001 From: James Maslek Date: Mon, 10 Apr 2023 13:44:07 -0400 Subject: [PATCH 01/38] Change installation from pip to poetry --- .github/workflows/macos_build.yml | 4 ++-- .github/workflows/windows.yml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 5c0d023602ab..af1d63188739 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -60,8 +60,8 @@ jobs: - name: Install Dependencies run: | pip list - python -m pip install -r requirements-full.txt - pip install -e . + build/conda/cleanup_artifacts.sh + poetry install -E all -E installer pip list - name: Build Bundle diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6c5763f28b4a..6aec20261938 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -87,8 +87,9 @@ jobs: shell: bash -l {0} run: | conda info - pip install --requirement requirements-full.txt + build\conda\cleanup_artifacts.bat pip install docstring_parser + poetry install -E all -E installer - name: List installed packages (Bash) shell: bash -l {0} From 87cdc7c1b902f6107e4af47695ecde9f3cea89b8 Mon Sep 17 00:00:00 2001 From: James Maslek Date: Mon, 10 Apr 2023 13:53:37 -0400 Subject: [PATCH 02/38] Change env name to obb --- .github/workflows/macos_build.yml | 2 +- .github/workflows/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index af1d63188739..f27375e8bba4 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -53,7 +53,7 @@ jobs: show-channel-urls: true channel-priority: flexible environment-file: build/conda/conda-3-9-env.yaml - activate-environment: build_env + activate-environment: obb auto-activate-base: false use-only-tar-bz2: true # Needed for caching some reason diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6aec20261938..339e2ab78661 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -54,7 +54,7 @@ jobs: show-channel-urls: true channel-priority: flexible environment-file: build/conda/conda-3-9-env.yaml - activate-environment: testing + activate-environment: obb # Needed for caching use-only-tar-bz2: true From 23138871597bcafb4d467f92be0430a3beff8802 Mon Sep 17 00:00:00 2001 From: James Maslek Date: Mon, 10 Apr 2023 14:14:59 -0400 Subject: [PATCH 03/38] Change shell for mac build --- .github/workflows/macos_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index f27375e8bba4..6e5611e0a7dd 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -58,6 +58,7 @@ jobs: use-only-tar-bz2: true # Needed for caching some reason - name: Install Dependencies + shell: bash run: | pip list build/conda/cleanup_artifacts.sh From bc0eb7e8167a454a671fc561a0475c99ecba9036 Mon Sep 17 00:00:00 2001 From: James Maslek Date: Mon, 10 Apr 2023 14:19:52 -0400 Subject: [PATCH 04/38] Activate the env --- .github/workflows/macos_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 6e5611e0a7dd..b2dd4043cd98 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -60,6 +60,7 @@ jobs: - name: Install Dependencies shell: bash run: | + conda activate obb pip list build/conda/cleanup_artifacts.sh poetry install -E all -E installer From c189294d686490135e0b7a814f4a7a769120bb33 Mon Sep 17 00:00:00 2001 From: James Maslek Date: Mon, 10 Apr 2023 14:25:10 -0400 Subject: [PATCH 05/38] Shell again --- .github/workflows/macos_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index b2dd4043cd98..708fba85d2c4 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -58,9 +58,9 @@ jobs: use-only-tar-bz2: true # Needed for caching some reason - name: Install Dependencies - shell: bash + shell: bash -l {0} run: | - conda activate obb + conda info pip list build/conda/cleanup_artifacts.sh poetry install -E all -E installer From b450c0ddfea4631c430d5a6da0428465d3b5b355 Mon Sep 17 00:00:00 2001 From: James Maslek Date: Mon, 10 Apr 2023 14:33:04 -0400 Subject: [PATCH 06/38] Shell from bash to bash -l {0} --- .github/workflows/macos_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 708fba85d2c4..54c32b162c65 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -68,7 +68,7 @@ jobs: - name: Build Bundle run: build/pyinstaller/build4mac.sh - shell: bash + shell: bash -l {0} - name: Creating Application Keychain env: @@ -103,7 +103,7 @@ jobs: security unlock-keychain -p $MACOS_INSTALLER_KEYCHAIN_PWD install.keychain build/pyinstaller/macOS/build-macos.sh OpenBBTerminal 0.0.1 mv build/pyinstaller/macOS/target/pkg/OpenBBTerminalM1.pkg OpenBBTerminal.pkg - shell: bash + shell: bash -l {0} - name: Deleting Previous Keychain run: | From 27527a6073cd250ba13d2186a0e7c8441bee7f19 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Mon, 10 Apr 2023 15:06:18 -0400 Subject: [PATCH 07/38] windows poetry --- .github/workflows/windows10_build.yml | 33 +++++++++++++++------------ 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index 99ab3776465b..fa931b35772d 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -28,23 +28,28 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Set up Python & Create OpenBB Environment - uses: actions/setup-python@v4 + # Set up miniconda using the environment yaml file within the repo + - name: Setup Miniconda + uses: conda-incubator/setup-miniconda@v2.2.0 with: - python-version: '3.9' + miniconda-version: "latest" + auto-update-conda: true + channels: conda-forge,defaults + show-channel-urls: true + channel-priority: flexible + environment-file: build/conda/conda-3-9-env.yaml + activate-environment: obb + auto-activate-base: false + use-only-tar-bz2: true # Needed for caching some reason - name: Create and start virtual environment run: | - python -m venv venv - source venv/Scripts/activate - python -m pip install --upgrade pip - python -m pip install setuptools==64.0.2 wheel - python -m pip install charset_normalizer==2.1.1 - python -m pip install -r requirements-full.txt - python -m pip uninstall papermill -y - python -m pip install git+https://github.com/nteract/papermill.git@main - python -m PyInstaller build/pyinstaller/terminal.spec --clean - + conda info + pip list + pip install rapidfuzz + build\conda\cleanup_artifacts.bat + poetry install -E all -E installer + pip list shell: bash - name: Upload Artifact @@ -100,7 +105,7 @@ jobs: dist\OpenBBTerminal\OpenBBTerminal.exe -t -s forecast cryptocurrency reports alternative economy futures econometrics dashboards portfolio stocks/test_stocks_options_screen.openbb stocks/test_stocks_options.openbb forex etf stocks/test_stocks_fa.openbb > result.txt cat result.txt Select-String "================================ integration test summary ================================" result.txt -Context 0,100 | Select-Object -Last 2000 | Out-File failed_tests.txt - + - name: Upload summary to Slack uses: adrey/slack-file-upload-action@master with: From 74dbf78ecce6cfeb86a33789ac02a6096076327f Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Mon, 10 Apr 2023 15:10:19 -0400 Subject: [PATCH 08/38] fix --- .github/workflows/windows10_build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index fa931b35772d..0dd45537473c 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -49,7 +49,10 @@ jobs: pip install rapidfuzz build\conda\cleanup_artifacts.bat poetry install -E all -E installer + pip uninstall papermill -y + pip install git+https://github.com/nteract/papermill.git@main pip list + PyInstaller build/pyinstaller/terminal.spec --clean shell: bash - name: Upload Artifact From cdc42a6e8748fff1e398f9195f4cc66e0e90aec1 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Mon, 10 Apr 2023 15:47:44 -0400 Subject: [PATCH 09/38] provactive fix --- .github/workflows/windows10_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index 0dd45537473c..3f53aa9c0e7a 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -53,7 +53,7 @@ jobs: pip install git+https://github.com/nteract/papermill.git@main pip list PyInstaller build/pyinstaller/terminal.spec --clean - shell: bash + shell: bash -l {0} - name: Upload Artifact uses: actions/upload-artifact@v3 From 088a615eb5c4d61f9be85313a5088085761d9e58 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Mon, 10 Apr 2023 15:59:50 -0400 Subject: [PATCH 10/38] fix --- .github/workflows/windows10_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index 3f53aa9c0e7a..ab1e05c0b706 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -46,8 +46,8 @@ jobs: run: | conda info pip list - pip install rapidfuzz - build\conda\cleanup_artifacts.bat + pip install rapidfuzz==2.13.7 + build\\conda\\cleanup_artifacts.bat poetry install -E all -E installer pip uninstall papermill -y pip install git+https://github.com/nteract/papermill.git@main From ef9bcba4a8a169803157bdbcd30076a4b0d1b307 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Mon, 10 Apr 2023 16:29:39 -0400 Subject: [PATCH 11/38] venv --- .github/workflows/windows10_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index ab1e05c0b706..94da49f2f6ed 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -47,6 +47,7 @@ jobs: conda info pip list pip install rapidfuzz==2.13.7 + pip install virtualenv==20.7.2 build\\conda\\cleanup_artifacts.bat poetry install -E all -E installer pip uninstall papermill -y From 7c8635656791c742b5fa8bcb72f7e4c3f5bccc07 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Mon, 10 Apr 2023 16:45:47 -0400 Subject: [PATCH 12/38] removing pathex --- build/pyinstaller/terminal.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/build/pyinstaller/terminal.spec b/build/pyinstaller/terminal.spec index 5e9997971d76..6a67054337ff 100644 --- a/build/pyinstaller/terminal.spec +++ b/build/pyinstaller/terminal.spec @@ -24,13 +24,7 @@ build_type = ( venv_path = Path(sys.executable).parent.parent.resolve() # Check if we are running in a conda environment -if is_darwin: - pathex = os.path.join(os.path.dirname(os.__file__), "site-packages") -else: - if "site-packages" in list(venv_path.iterdir()): - pathex = str(venv_path / "site-packages") - else: - pathex = str(venv_path / "lib" / "site-packages") +pathex = os.path.join(os.path.dirname(os.__file__), "site-packages") # Removing unused ARM64 binary From 48c53ac9c08d3de8452e8195389defb1b297bd6b Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Mon, 10 Apr 2023 23:04:01 -0400 Subject: [PATCH 13/38] artifact to v2.2.4 --- .github/workflows/windows10_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index 94da49f2f6ed..5300da715517 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -57,7 +57,7 @@ jobs: shell: bash -l {0} - name: Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2.2.4 with: name: OpenBB-Windows10-ENV path: dist From 66a18239006b411574c09fe75a0d3e87c6eb9b99 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 09:08:18 -0400 Subject: [PATCH 14/38] v3 --- .github/workflows/windows10_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index 5300da715517..5603cbade93e 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -57,7 +57,7 @@ jobs: shell: bash -l {0} - name: Upload Artifact - uses: actions/upload-artifact@v2.2.4 + uses: actions/upload-artifact@v3 with: name: OpenBB-Windows10-ENV path: dist @@ -78,7 +78,7 @@ jobs: uses: actions/checkout@v3 - name: Download Artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: OpenBB-Windows10-ENV path: dist From 21bfc7e8b440839de55557dcd3b3fd27ff44d932 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 10:40:19 -0400 Subject: [PATCH 15/38] zip and unzip test --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 683be159116b..b793e89c9778 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -101,7 +101,7 @@ grpcio = "^1.51.1" jupyterlab-widgets = "^3.0.3" mstarpy = "^0.0.4" packaging = ">=22.0" -rapidfuzz = "^2.13.7" +rapidfuzz = "^2.15.0" streamlit = "^1.17.0" pywry = "^0.4.5" svglib = "^1.5.0" From deda5f3ea5b532ee3618c25207649e5dbf1423d0 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 10:52:49 -0400 Subject: [PATCH 16/38] fuzz fix --- .github/workflows/windows10_build.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index 5603cbade93e..4873eae1d8ac 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -46,7 +46,7 @@ jobs: run: | conda info pip list - pip install rapidfuzz==2.13.7 + pip install rapidfuzz==2.15.1 pip install virtualenv==20.7.2 build\\conda\\cleanup_artifacts.bat poetry install -E all -E installer @@ -56,11 +56,16 @@ jobs: PyInstaller build/pyinstaller/terminal.spec --clean shell: bash -l {0} + - name: zip the file + run: | + Compress-Archive * release.zip + shell: pwsh + - name: Upload Artifact uses: actions/upload-artifact@v3 with: name: OpenBB-Windows10-ENV - path: dist + path: release.zip Build-Exe: @@ -81,7 +86,11 @@ jobs: uses: actions/download-artifact@v3 with: name: OpenBB-Windows10-ENV - path: dist + path: release.zip + + - name: unzip artifact for deployment + run: Expand-Archive release.zip -DestinationPath . + shell: pwsh - name: Move Files into App Folder run: cp -r .\dist\OpenBBTerminal\ .\build\nsis\app\ From d57f3fd4f5ec8951e32d4abdf748433396b8e131 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 11:19:33 -0400 Subject: [PATCH 17/38] numpy stupid --- .github/workflows/windows10_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index 4873eae1d8ac..84ebf29cd0d1 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -47,6 +47,7 @@ jobs: conda info pip list pip install rapidfuzz==2.15.1 + pip install numpy==1.23.4 pip install virtualenv==20.7.2 build\\conda\\cleanup_artifacts.bat poetry install -E all -E installer From ccd368340d613387be3481facb0fb463a78f4d22 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 11:38:28 -0400 Subject: [PATCH 18/38] asdf --- .github/workflows/windows10_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index 84ebf29cd0d1..81395fd341e4 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -47,7 +47,7 @@ jobs: conda info pip list pip install rapidfuzz==2.15.1 - pip install numpy==1.23.4 + pip install numpy==1.23.5 pip install virtualenv==20.7.2 build\\conda\\cleanup_artifacts.bat poetry install -E all -E installer From 414b88e5d8c0b241b854d1ccddef263c121f8c59 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 12:06:22 -0400 Subject: [PATCH 19/38] cmd line --- .github/workflows/windows10_build.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index 81395fd341e4..f697375f7504 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -46,10 +46,16 @@ jobs: run: | conda info pip list - pip install rapidfuzz==2.15.1 - pip install numpy==1.23.5 pip install virtualenv==20.7.2 - build\\conda\\cleanup_artifacts.bat + shell: bash -l {0} + + - name: remove bad files from conda env + run: | + build\conda\cleanup_artifacts.bat + shell: cmd + + - name: Set up poetry and build pyinstaller + run: | poetry install -E all -E installer pip uninstall papermill -y pip install git+https://github.com/nteract/papermill.git@main From 1942e82f600b4e46bcda0adf155c418e3c9b66b5 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 12:19:35 -0400 Subject: [PATCH 20/38] forgot to activate --- .github/workflows/windows10_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index f697375f7504..5c08eccd9222 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -51,6 +51,7 @@ jobs: - name: remove bad files from conda env run: | + conda activate obb build\conda\cleanup_artifacts.bat shell: cmd From 221400fd4d08c532a41a9c35665912be3e63fcbc Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 12:40:51 -0400 Subject: [PATCH 21/38] asdf --- .github/workflows/windows10_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index 5c08eccd9222..22af79d400d3 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -52,6 +52,7 @@ jobs: - name: remove bad files from conda env run: | conda activate obb + pip list build\conda\cleanup_artifacts.bat shell: cmd From e75861fc1eb2fcb76f08fccd0fcefac88b078efa Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 12:57:20 -0400 Subject: [PATCH 22/38] asdf --- .github/workflows/windows10_build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index 22af79d400d3..f0bf9758561d 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -54,7 +54,6 @@ jobs: conda activate obb pip list build\conda\cleanup_artifacts.bat - shell: cmd - name: Set up poetry and build pyinstaller run: | From 1a6d13ee8f50e63469b292c7b857df5e9aad51ff Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 13:31:08 -0400 Subject: [PATCH 23/38] i dunno anymore --- build/conda/cleanup_artifacts.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/conda/cleanup_artifacts.bat b/build/conda/cleanup_artifacts.bat index 4335f1f8f12f..dfbbf7e9565b 100644 --- a/build/conda/cleanup_artifacts.bat +++ b/build/conda/cleanup_artifacts.bat @@ -37,7 +37,7 @@ if not !conda_prefix! == %CONDA_DEFAULT_ENV% ( ) :: Remove build artifacts -set site_packages_dir=!path!\Lib\site-packages +set site_packages_dir=!path!\lib\site-packages cd !site_packages_dir! echo !site_packages_dir! @REM For /r %%~1f IN (direct_url.json) do Echo "%~1f" From 942b8e620639e152815ad4cad52f3744e30135b7 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 14:30:52 -0400 Subject: [PATCH 24/38] back to old faithful --- .github/workflows/windows10_build.yml | 43 ++++++++------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index f0bf9758561d..a6418fa07b94 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -28,41 +28,22 @@ jobs: - name: Checkout uses: actions/checkout@v3 - # Set up miniconda using the environment yaml file within the repo - - name: Setup Miniconda - uses: conda-incubator/setup-miniconda@v2.2.0 + - name: Set up Python & Create OpenBB Environment + uses: actions/setup-python@v4 with: - miniconda-version: "latest" - auto-update-conda: true - channels: conda-forge,defaults - show-channel-urls: true - channel-priority: flexible - environment-file: build/conda/conda-3-9-env.yaml - activate-environment: obb - auto-activate-base: false - use-only-tar-bz2: true # Needed for caching some reason + python-version: '3.9' - name: Create and start virtual environment run: | - conda info - pip list - pip install virtualenv==20.7.2 - shell: bash -l {0} - - - name: remove bad files from conda env - run: | - conda activate obb - pip list - build\conda\cleanup_artifacts.bat - - - name: Set up poetry and build pyinstaller - run: | - poetry install -E all -E installer - pip uninstall papermill -y - pip install git+https://github.com/nteract/papermill.git@main - pip list - PyInstaller build/pyinstaller/terminal.spec --clean - shell: bash -l {0} + python -m venv venv + source venv/Scripts/activate + python -m pip install --upgrade pip + python -m pip install setuptools==64.0.2 wheel + python -m pip install -r requirements-full.txt + python -m pip uninstall papermill -y + python -m pip install git+https://github.com/nteract/papermill.git@main + python -m PyInstaller build/pyinstaller/terminal.spec --clean + shell: bash - name: zip the file run: | From b77e7ca590a05b66a712e7974c829a7a84d62320 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 14:41:04 -0400 Subject: [PATCH 25/38] fix spec --- build/pyinstaller/terminal.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build/pyinstaller/terminal.spec b/build/pyinstaller/terminal.spec index 6a67054337ff..5e9997971d76 100644 --- a/build/pyinstaller/terminal.spec +++ b/build/pyinstaller/terminal.spec @@ -24,7 +24,13 @@ build_type = ( venv_path = Path(sys.executable).parent.parent.resolve() # Check if we are running in a conda environment -pathex = os.path.join(os.path.dirname(os.__file__), "site-packages") +if is_darwin: + pathex = os.path.join(os.path.dirname(os.__file__), "site-packages") +else: + if "site-packages" in list(venv_path.iterdir()): + pathex = str(venv_path / "site-packages") + else: + pathex = str(venv_path / "lib" / "site-packages") # Removing unused ARM64 binary From 1227ade2c9535d3464d65998dcd5e00ecaf0fd03 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 15:25:04 -0400 Subject: [PATCH 26/38] fixing zip maybe --- .github/workflows/windows10_build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index a6418fa07b94..e00a9ae1f0f7 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -43,11 +43,13 @@ jobs: python -m pip uninstall papermill -y python -m pip install git+https://github.com/nteract/papermill.git@main python -m PyInstaller build/pyinstaller/terminal.spec --clean + pwd shell: bash - name: zip the file run: | - Compress-Archive * release.zip + Get-Location + Compress-Archive dist release.zip shell: pwsh - name: Upload Artifact From 196c9c40af6b24551d67c08ada770d8a0c9e5523 Mon Sep 17 00:00:00 2001 From: "luqazino@gmail.com" Date: Tue, 11 Apr 2023 22:05:16 +0100 Subject: [PATCH 27/38] path fix --- .github/workflows/windows10_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index e00a9ae1f0f7..081f56748f6b 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -77,10 +77,10 @@ jobs: uses: actions/download-artifact@v3 with: name: OpenBB-Windows10-ENV - path: release.zip + path: . - name: unzip artifact for deployment - run: Expand-Archive release.zip -DestinationPath . + run: Expand-Archive release.zip -DestinationPath dist shell: pwsh - name: Move Files into App Folder From 62a51032b8e34d138da9c65a39bb2db81062e08f Mon Sep 17 00:00:00 2001 From: "luqazino@gmail.com" Date: Tue, 11 Apr 2023 22:43:55 +0100 Subject: [PATCH 28/38] fix path --- .github/workflows/windows10_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows10_build.yml b/.github/workflows/windows10_build.yml index 081f56748f6b..9c12e3f388fe 100644 --- a/.github/workflows/windows10_build.yml +++ b/.github/workflows/windows10_build.yml @@ -80,7 +80,7 @@ jobs: path: . - name: unzip artifact for deployment - run: Expand-Archive release.zip -DestinationPath dist + run: Expand-Archive release.zip -DestinationPath . shell: pwsh - name: Move Files into App Folder From 6acc90c931a3c89b28ae8d573f911c518db42695 Mon Sep 17 00:00:00 2001 From: "luqazino@gmail.com" Date: Tue, 11 Apr 2023 23:02:31 +0100 Subject: [PATCH 29/38] code cleanup --- .github/workflows/build-release.yml | 4 ++-- .github/workflows/nightly-build.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 2e616a35fc5b..2bbdd1f2e0b3 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -35,10 +35,10 @@ jobs: trigger-macos-build: runs-on: ubuntu-latest steps: - - name: Trigger MacOs Build + - name: Trigger Intel & M1 MacOs Build uses: aurelien-baudet/workflow-dispatch@v2 with: - workflow: macos_-uild.yml + workflow: macos-build.yml token: ${{ secrets.GITHUB_TOKEN }} wait-for-completion-timeout: 2h diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 7a0d2e98d2f0..292d12b5d86f 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -52,5 +52,5 @@ jobs: - name: Trigger PyPI Build uses: aurelien-baudet/workflow-dispatch@v2 with: - workflow: nightly-pypi.yml + workflow: pypi-nightly.yml token: ${{ secrets.GITHUB_TOKEN }} From 28174046f594adf089a2c6843a7908fa17574918 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 21:25:16 -0400 Subject: [PATCH 30/38] change artifact back --- build/conda/cleanup_artifacts.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/conda/cleanup_artifacts.bat b/build/conda/cleanup_artifacts.bat index dfbbf7e9565b..4335f1f8f12f 100644 --- a/build/conda/cleanup_artifacts.bat +++ b/build/conda/cleanup_artifacts.bat @@ -37,7 +37,7 @@ if not !conda_prefix! == %CONDA_DEFAULT_ENV% ( ) :: Remove build artifacts -set site_packages_dir=!path!\lib\site-packages +set site_packages_dir=!path!\Lib\site-packages cd !site_packages_dir! echo !site_packages_dir! @REM For /r %%~1f IN (direct_url.json) do Echo "%~1f" From 14f6656012bee46c7cb00ba0eb68975974697b31 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 21:36:04 -0400 Subject: [PATCH 31/38] test new nsis info --- build/nsis/setup.nsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/build/nsis/setup.nsi b/build/nsis/setup.nsi index bcba92458d4b..2326a7aeb932 100644 --- a/build/nsis/setup.nsi +++ b/build/nsis/setup.nsi @@ -13,6 +13,17 @@ !define VERSION "3.0.0rc1" !define SLUG "${NAME} v${VERSION}" +;-------------------------------- +; Info for launcher.exe +VIProductVersion 3.0.0rc1 +VIAddVersionKey ProductName "OpenBB Terminal" +VIAddVersionKey Comments "An installer for OpenBB Terminal. For additional details, visit OpenBB.co" +VIAddVersionKey CompanyName OpenBB.co +VIAddVersionKey FileDescription "OpenBB Terminal Program" +VIAddVersionKey FileVersion 3.0.0rc1 +VIAddVersionKey ProductVersion 3.0.0rc1 +VIAddVersionKey InternalName "OpenBB Terminal" + ;-------------------------------- ; General Name "${NAME}" From 72e31db1cfba90495e4f4b0ca23fd773fceb7ef4 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 22:27:07 -0400 Subject: [PATCH 32/38] didnt like my version --- build/nsis/setup.nsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build/nsis/setup.nsi b/build/nsis/setup.nsi index 2326a7aeb932..6d36343bec08 100644 --- a/build/nsis/setup.nsi +++ b/build/nsis/setup.nsi @@ -15,14 +15,14 @@ ;-------------------------------- ; Info for launcher.exe -VIProductVersion 3.0.0rc1 -VIAddVersionKey ProductName "OpenBB Terminal" -VIAddVersionKey Comments "An installer for OpenBB Terminal. For additional details, visit OpenBB.co" -VIAddVersionKey CompanyName OpenBB.co -VIAddVersionKey FileDescription "OpenBB Terminal Program" -VIAddVersionKey FileVersion 3.0.0rc1 -VIAddVersionKey ProductVersion 3.0.0rc1 -VIAddVersionKey InternalName "OpenBB Terminal" + VIProductVersion 3.0.0.0 + VIAddVersionKey ProductName "OpenBB Terminal" + VIAddVersionKey Comments "An installer for OpenBB Terminal. For additional details, visit OpenBB.co" + VIAddVersionKey CompanyName OpenBB.co + VIAddVersionKey FileDescription "OpenBB Terminal Program" + VIAddVersionKey FileVersion 3.0.0.0 + VIAddVersionKey ProductVersion 3.0.0.0 + VIAddVersionKey InternalName "OpenBB Terminal" ;-------------------------------- ; General From 2e46e3d83fb8ba330acfc3291a3d26fdafa0474c Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 22:39:27 -0400 Subject: [PATCH 33/38] add start program to end of install --- build/nsis/setup.nsi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/build/nsis/setup.nsi b/build/nsis/setup.nsi index 6d36343bec08..27013bb71a1a 100644 --- a/build/nsis/setup.nsi +++ b/build/nsis/setup.nsi @@ -42,6 +42,10 @@ !define MUI_ABORTWARNING !define MUI_WELCOMEPAGE_TITLE "${SLUG} Setup" !define UninstId "OpenBBTerminal" ; You might want to use a GUID here + !define MUI_FINISHPAGE_RUN + !define MUI_FINISHPAGE_RUN_NOTCHECKED + !define MUI_FINISHPAGE_RUN_TEXT "Start OpenBB Terminal" + !define MUI_FINISHPAGE_RUN_FUNCTION "StartOpenBB" ;-------------------------------- ; Pages @@ -84,6 +88,12 @@ Var STR_CONTAINS_VAR_3 Var STR_CONTAINS_VAR_4 Var STR_RETURN_VAR + +Function StartOpenBB + Exec "$InstDir\OpenBBTerminal.exe" +FunctionEnd + + Function StrContains Exch $STR_NEEDLE Exch 1 From 38cb2ba73a40147c08b379582c7f77f5bec9cd95 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Tue, 11 Apr 2023 22:53:56 -0400 Subject: [PATCH 34/38] adding launch button to installer --- build/nsis/setup.nsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/nsis/setup.nsi b/build/nsis/setup.nsi index 27013bb71a1a..72bd53cdc0fc 100644 --- a/build/nsis/setup.nsi +++ b/build/nsis/setup.nsi @@ -14,7 +14,7 @@ !define SLUG "${NAME} v${VERSION}" ;-------------------------------- -; Info for launcher.exe +; Info for Installer.exe VIProductVersion 3.0.0.0 VIAddVersionKey ProductName "OpenBB Terminal" VIAddVersionKey Comments "An installer for OpenBB Terminal. For additional details, visit OpenBB.co" From bf1fe6ee09fe1291917bfa0af291f60fb6e37575 Mon Sep 17 00:00:00 2001 From: andrewkenreich Date: Wed, 12 Apr 2023 08:50:06 -0400 Subject: [PATCH 35/38] testing version file --- build/pyinstaller/terminal.spec | 1 + build/pyinstaller/version.rc | 42 +++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 build/pyinstaller/version.rc diff --git a/build/pyinstaller/terminal.spec b/build/pyinstaller/terminal.spec index 5e9997971d76..06abc29e86f9 100644 --- a/build/pyinstaller/terminal.spec +++ b/build/pyinstaller/terminal.spec @@ -214,6 +214,7 @@ exe_kwargs = dict( codesign_identity=None, entitlements_file=None, icon=exe_icon, + version='version.rc' ) diff --git a/build/pyinstaller/version.rc b/build/pyinstaller/version.rc new file mode 100644 index 000000000000..3cb664cfdbef --- /dev/null +++ b/build/pyinstaller/version.rc @@ -0,0 +1,42 @@ +# UTF-8 +# +# For more details about fixed file info 'ffi' see: +# http://msdn.microsoft.com/en-us/library/ms646997.aspx +VSVersionInfo( + ffi=FixedFileInfo( + # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) + # Set not needed items to zero 0. + filevers=(3, 0, 0, 0), + prodvers=(3, 0, 0, 0), + # Contains a bitmask that specifies the valid bits 'flags'r + mask=0x0, + # Contains a bitmask that specifies the Boolean attributes of the file. + flags=0x0, + # The operating system for which this file was designed. + # 0x4 - NT and there is no need to change it. + OS=0x4, + # The general type of file. + # 0x1 - the file is an application. + fileType=0x1, + # The function of the file. + # 0x0 - the function is not defined for this fileType + subtype=0x0, + # Creation date and time stamp. + date=(0, 0) + ), + kids=[ + StringFileInfo( + [ + StringTable( + '040904b0', + [StringStruct('Comments', 'The OpenBB Terminal. For additional details, visit OpenBB.co'), + StringStruct('CompanyName', 'OpenBB'), + StringStruct('FileDescription', 'OpenBB Terminal Program'), + StringStruct('FileVersion', '3.0.0.0'), + StringStruct('InternalName', 'OpenBB Terminal'), + StringStruct('ProductName', 'OpenBB Terminal'), + StringStruct('ProductVersion', '3.0.0.0')]) + ]), + VarFileInfo([VarStruct('Translation', [1033, 1200])]) + ] +) From db6dafcad215faa41d497b8e5fee508be53ab113 Mon Sep 17 00:00:00 2001 From: James Maslek Date: Wed, 12 Apr 2023 10:08:29 -0400 Subject: [PATCH 36/38] Copy over mac os --- .github/workflows/macos-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index 4a5b8e35c567..aaabc002f896 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -58,6 +58,8 @@ jobs: pip list build/conda/cleanup_artifacts.sh poetry install -E all -E installer + pip uninstall papermill -y + pip install git+https://github.com/nteract/papermill.git@main pip list - name: Build Bundle From 3fd54a4cab776bdce66264ef315c2278d75db077 Mon Sep 17 00:00:00 2001 From: James Maslek Date: Wed, 12 Apr 2023 10:15:57 -0400 Subject: [PATCH 37/38] poetry --- poetry.lock | 199 ++++++++++++++++++++++++++-------------------------- 1 file changed, 100 insertions(+), 99 deletions(-) diff --git a/poetry.lock b/poetry.lock index 6664e325cdc1..41697cfd9111 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.4.0 and should not be changed by hand. +# This file is automatically @generated by Poetry and should not be changed by hand. [[package]] name = "absl-py" @@ -6674,101 +6674,104 @@ six = "*" [[package]] name = "rapidfuzz" -version = "2.13.7" +version = "2.15.1" description = "rapid fuzzy string matching" category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "rapidfuzz-2.13.7-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:b75dd0928ce8e216f88660ab3d5c5ffe990f4dd682fd1709dba29d5dafdde6de"}, - {file = "rapidfuzz-2.13.7-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:24d3fea10680d085fd0a4d76e581bfb2b1074e66e78fd5964d4559e1fcd2a2d4"}, - {file = "rapidfuzz-2.13.7-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8109e0324d21993d5b2d111742bf5958f3516bf8c59f297c5d1cc25a2342eb66"}, - {file = "rapidfuzz-2.13.7-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b5f705652360d520c2de52bee11100c92f59b3e3daca308ebb150cbc58aecdad"}, - {file = "rapidfuzz-2.13.7-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7496e8779905b02abc0ab4ba2a848e802ab99a6e20756ffc967a0de4900bd3da"}, - {file = "rapidfuzz-2.13.7-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:24eb6b843492bdc63c79ee4b2f104059b7a2201fef17f25177f585d3be03405a"}, - {file = "rapidfuzz-2.13.7-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:467c1505362823a5af12b10234cb1c4771ccf124c00e3fc9a43696512bd52293"}, - {file = "rapidfuzz-2.13.7-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:53dcae85956853b787c27c1cb06f18bb450e22cf57a4ad3444cf03b8ff31724a"}, - {file = "rapidfuzz-2.13.7-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:46b9b8aa09998bc48dd800854e8d9b74bc534d7922c1d6e1bbf783e7fa6ac29c"}, - {file = "rapidfuzz-2.13.7-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:1fbad8fb28d98980f5bff33c7842efef0315d42f0cd59082108482a7e6b61410"}, - {file = "rapidfuzz-2.13.7-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:43fb8cb030f888c3f076d40d428ed5eb4331f5dd6cf1796cfa39c67bf0f0fc1e"}, - {file = "rapidfuzz-2.13.7-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:b6bad92de071cbffa2acd4239c1779f66851b60ffbbda0e4f4e8a2e9b17e7eef"}, - {file = "rapidfuzz-2.13.7-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d00df2e4a81ffa56a6b1ec4d2bc29afdcb7f565e0b8cd3092fece2290c4c7a79"}, - {file = "rapidfuzz-2.13.7-cp310-cp310-win32.whl", hash = "sha256:2c836f0f2d33d4614c3fbaf9a1eb5407c0fe23f8876f47fd15b90f78daa64c34"}, - {file = "rapidfuzz-2.13.7-cp310-cp310-win_amd64.whl", hash = "sha256:c36fd260084bb636b9400bb92016c6bd81fd80e59ed47f2466f85eda1fc9f782"}, - {file = "rapidfuzz-2.13.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:b34e8c0e492949ecdd5da46a1cfc856a342e2f0389b379b1a45a3cdcd3176a6e"}, - {file = "rapidfuzz-2.13.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:875d51b3497439a72e2d76183e1cb5468f3f979ab2ddfc1d1f7dde3b1ecfb42f"}, - {file = "rapidfuzz-2.13.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ae33a72336059213996fe4baca4e0e4860913905c2efb7c991eab33b95a98a0a"}, - {file = "rapidfuzz-2.13.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5585189b3d90d81ccd62d4f18530d5ac8972021f0aaaa1ffc6af387ff1dce75"}, - {file = "rapidfuzz-2.13.7-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:42085d4b154a8232767de8296ac39c8af5bccee6b823b0507de35f51c9cbc2d7"}, - {file = "rapidfuzz-2.13.7-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:585206112c294e335d84de5d5f179c0f932837752d7420e3de21db7fdc476278"}, - {file = "rapidfuzz-2.13.7-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f891b98f8bc6c9d521785816085e9657212621e93f223917fb8e32f318b2957e"}, - {file = "rapidfuzz-2.13.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:08590905a95ccfa43f4df353dcc5d28c15d70664299c64abcad8721d89adce4f"}, - {file = "rapidfuzz-2.13.7-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:b5dd713a1734574c2850c566ac4286594bacbc2d60b9170b795bee4b68656625"}, - {file = "rapidfuzz-2.13.7-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:988f8f6abfba7ee79449f8b50687c174733b079521c3cc121d65ad2d38831846"}, - {file = "rapidfuzz-2.13.7-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:b3210869161a864f3831635bb13d24f4708c0aa7208ef5baac1ac4d46e9b4208"}, - {file = "rapidfuzz-2.13.7-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:f6fe570e20e293eb50491ae14ddeef71a6a7e5f59d7e791393ffa99b13f1f8c2"}, - {file = "rapidfuzz-2.13.7-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:6120f2995f5154057454c5de99d86b4ef3b38397899b5da1265467e8980b2f60"}, - {file = "rapidfuzz-2.13.7-cp311-cp311-win32.whl", hash = "sha256:b20141fa6cee041917801de0bab503447196d372d4c7ee9a03721b0a8edf5337"}, - {file = "rapidfuzz-2.13.7-cp311-cp311-win_amd64.whl", hash = "sha256:ec55a81ac2b0f41b8d6fb29aad16e55417036c7563bad5568686931aa4ff08f7"}, - {file = "rapidfuzz-2.13.7-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7d005e058d86f2a968a8d28ca6f2052fab1f124a39035aa0523261d6baf21e1f"}, - {file = "rapidfuzz-2.13.7-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fe59a0c21a032024edb0c8e43f5dee5623fef0b65a1e3c1281836d9ce199af3b"}, - {file = "rapidfuzz-2.13.7-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cdfc04f7647c29fb48da7a04082c34cdb16f878d3c6d098d62d5715c0ad3000c"}, - {file = "rapidfuzz-2.13.7-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:68a89bb06d5a331511961f4d3fa7606f8e21237467ba9997cae6f67a1c2c2b9e"}, - {file = "rapidfuzz-2.13.7-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:effe182767d102cb65dfbbf74192237dbd22d4191928d59415aa7d7c861d8c88"}, - {file = "rapidfuzz-2.13.7-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:25b4cedf2aa19fb7212894ce5f5219010cce611b60350e9a0a4d492122e7b351"}, - {file = "rapidfuzz-2.13.7-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:3a9bd02e1679c0fd2ecf69b72d0652dbe2a9844eaf04a36ddf4adfbd70010e95"}, - {file = "rapidfuzz-2.13.7-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:5e2b3d020219baa75f82a4e24b7c8adcb598c62f0e54e763c39361a9e5bad510"}, - {file = "rapidfuzz-2.13.7-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:cf62dacb3f9234f3fddd74e178e6d25c68f2067fde765f1d95f87b1381248f58"}, - {file = "rapidfuzz-2.13.7-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:fa263135b892686e11d5b84f6a1892523123a00b7e5882eff4fbdabb38667347"}, - {file = "rapidfuzz-2.13.7-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:fa4c598ed77f74ec973247ca776341200b0f93ec3883e34c222907ce72cb92a4"}, - {file = "rapidfuzz-2.13.7-cp37-cp37m-win32.whl", hash = "sha256:c2523f8180ebd9796c18d809e9a19075a1060b1a170fde3799e83db940c1b6d5"}, - {file = "rapidfuzz-2.13.7-cp37-cp37m-win_amd64.whl", hash = "sha256:5ada0a14c67452358c1ee52ad14b80517a87b944897aaec3e875279371a9cb96"}, - {file = "rapidfuzz-2.13.7-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:ca8a23097c1f50e0fdb4de9e427537ca122a18df2eead06ed39c3a0bef6d9d3a"}, - {file = "rapidfuzz-2.13.7-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9be02162af0376d64b840f2fc8ee3366794fc149f1e06d095a6a1d42447d97c5"}, - {file = "rapidfuzz-2.13.7-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:af4f7c3c904ca709493eb66ca9080b44190c38e9ecb3b48b96d38825d5672559"}, - {file = "rapidfuzz-2.13.7-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1f50d1227e6e2a0e3ae1fb1c9a2e1c59577d3051af72c7cab2bcc430cb5e18da"}, - {file = "rapidfuzz-2.13.7-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c71d9d512b76f05fa00282227c2ae884abb60e09f08b5ca3132b7e7431ac7f0d"}, - {file = "rapidfuzz-2.13.7-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b52ac2626945cd21a2487aeefed794c14ee31514c8ae69b7599170418211e6f6"}, - {file = "rapidfuzz-2.13.7-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ca00fafd2756bc9649bf80f1cf72c647dce38635f0695d7ce804bc0f759aa756"}, - {file = "rapidfuzz-2.13.7-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d248a109699ce9992304e79c1f8735c82cc4c1386cd8e27027329c0549f248a2"}, - {file = "rapidfuzz-2.13.7-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:c88adbcb933f6b8612f6c593384bf824e562bb35fc8a0f55fac690ab5b3486e5"}, - {file = "rapidfuzz-2.13.7-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:c8601a66fbfc0052bb7860d2eacd303fcde3c14e87fdde409eceff516d659e77"}, - {file = "rapidfuzz-2.13.7-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:27be9c63215d302ede7d654142a2e21f0d34ea6acba512a4ae4cfd52bbaa5b59"}, - {file = "rapidfuzz-2.13.7-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:3dcffe1f3cbda0dc32133a2ae2255526561ca594f15f9644384549037b355245"}, - {file = "rapidfuzz-2.13.7-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8450d15f7765482e86ef9be2ad1a05683cd826f59ad236ef7b9fb606464a56aa"}, - {file = "rapidfuzz-2.13.7-cp38-cp38-win32.whl", hash = "sha256:460853983ab88f873173e27cc601c5276d469388e6ad6e08c4fd57b2a86f1064"}, - {file = "rapidfuzz-2.13.7-cp38-cp38-win_amd64.whl", hash = "sha256:424f82c35dbe4f83bdc3b490d7d696a1dc6423b3d911460f5493b7ffae999fd2"}, - {file = "rapidfuzz-2.13.7-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c3fbe449d869ea4d0909fc9d862007fb39a584fb0b73349a6aab336f0d90eaed"}, - {file = "rapidfuzz-2.13.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:16080c05a63d6042643ae9b6cfec1aefd3e61cef53d0abe0df3069b9d4b72077"}, - {file = "rapidfuzz-2.13.7-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:dbcf5371ea704759fcce772c66a07647751d1f5dbdec7818331c9b31ae996c77"}, - {file = "rapidfuzz-2.13.7-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:114810491efb25464016fd554fdf1e20d390309cecef62587494fc474d4b926f"}, - {file = "rapidfuzz-2.13.7-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:99a84ab9ac9a823e7e93b4414f86344052a5f3e23b23aa365cda01393ad895bd"}, - {file = "rapidfuzz-2.13.7-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:81642a24798851b118f82884205fc1bd9ff70b655c04018c467824b6ecc1fabc"}, - {file = "rapidfuzz-2.13.7-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c3741cb0bf9794783028e8b0cf23dab917fa5e37a6093b94c4c2f805f8e36b9f"}, - {file = "rapidfuzz-2.13.7-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:759a3361711586a29bc753d3d1bdb862983bd9b9f37fbd7f6216c24f7c972554"}, - {file = "rapidfuzz-2.13.7-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:1333fb3d603d6b1040e365dca4892ba72c7e896df77a54eae27dc07db90906e3"}, - {file = "rapidfuzz-2.13.7-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:916bc2e6cf492c77ad6deb7bcd088f0ce9c607aaeabc543edeb703e1fbc43e31"}, - {file = "rapidfuzz-2.13.7-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:23524635840500ce6f4d25005c9529a97621689c85d2f727c52eed1782839a6a"}, - {file = "rapidfuzz-2.13.7-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:ebe303cd9839af69dd1f7942acaa80b1ba90bacef2e7ded9347fbed4f1654672"}, - {file = "rapidfuzz-2.13.7-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:fe56659ccadbee97908132135de4b875543353351e0c92e736b7c57aee298b5a"}, - {file = "rapidfuzz-2.13.7-cp39-cp39-win32.whl", hash = "sha256:3f11a7eff7bc6301cd6a5d43f309e22a815af07e1f08eeb2182892fca04c86cb"}, - {file = "rapidfuzz-2.13.7-cp39-cp39-win_amd64.whl", hash = "sha256:e8914dad106dacb0775718e54bf15e528055c4e92fb2677842996f2d52da5069"}, - {file = "rapidfuzz-2.13.7-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:7f7930adf84301797c3f09c94b9c5a9ed90a9e8b8ed19b41d2384937e0f9f5bd"}, - {file = "rapidfuzz-2.13.7-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c31022d9970177f6affc6d5dd757ed22e44a10890212032fabab903fdee3bfe7"}, - {file = "rapidfuzz-2.13.7-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f42b82f268689f429def9ecfb86fa65ceea0eaf3fed408b570fe113311bf5ce7"}, - {file = "rapidfuzz-2.13.7-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b477b43ced896301665183a5e0faec0f5aea2373005648da8bdcb3c4b73f280"}, - {file = "rapidfuzz-2.13.7-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:d63def9bbc6b35aef4d76dc740301a4185867e8870cbb8719ec9de672212fca8"}, - {file = "rapidfuzz-2.13.7-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:c66546e30addb04a16cd864f10f5821272a1bfe6462ee5605613b4f1cb6f7b48"}, - {file = "rapidfuzz-2.13.7-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f799d1d6c33d81e983d3682571cc7d993ae7ff772c19b3aabb767039c33f6d1e"}, - {file = "rapidfuzz-2.13.7-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d82f20c0060ffdaadaf642b88ab0aa52365b56dffae812e188e5bdb998043588"}, - {file = "rapidfuzz-2.13.7-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:042644133244bfa7b20de635d500eb9f46af7097f3d90b1724f94866f17cb55e"}, - {file = "rapidfuzz-2.13.7-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:75c45dcd595f8178412367e302fd022860ea025dc4a78b197b35428081ed33d5"}, - {file = "rapidfuzz-2.13.7-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:3d8b081988d0a49c486e4e845a547565fee7c6e7ad8be57ff29c3d7c14c6894c"}, - {file = "rapidfuzz-2.13.7-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:16ffad751f43ab61001187b3fb4a9447ec2d1aedeff7c5bac86d3b95f9980cc3"}, - {file = "rapidfuzz-2.13.7-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:020858dd89b60ce38811cd6e37875c4c3c8d7fcd8bc20a0ad2ed1f464b34dc4e"}, - {file = "rapidfuzz-2.13.7-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cda1e2f66bb4ba7261a0f4c2d052d5d909798fca557cbff68f8a79a87d66a18f"}, - {file = "rapidfuzz-2.13.7-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:b6389c50d8d214c9cd11a77f6d501529cb23279a9c9cafe519a3a4b503b5f72a"}, - {file = "rapidfuzz-2.13.7.tar.gz", hash = "sha256:8d3e252d4127c79b4d7c2ae47271636cbaca905c8bb46d80c7930ab906cf4b5c"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:fc0bc259ebe3b93e7ce9df50b3d00e7345335d35acbd735163b7c4b1957074d3"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d59fb3a410d253f50099d7063855c2b95df1ef20ad93ea3a6b84115590899f25"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c525a3da17b6d79d61613096c8683da86e3573e807dfaecf422eea09e82b5ba6"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4deae6a918ecc260d0c4612257be8ba321d8e913ccb43155403842758c46fbe"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2577463d10811386e704a3ab58b903eb4e2a31b24dfd9886d789b0084d614b01"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f67d5f56aa48c0da9de4ab81bffb310683cf7815f05ea38e5aa64f3ba4368339"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d7927722ff43690e52b3145b5bd3089151d841d350c6f8378c3cfac91f67573a"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6534afc787e32c4104f65cdeb55f6abe4d803a2d0553221d00ef9ce12788dcde"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d0ae6ec79a1931929bb9dd57bc173eb5ba4c7197461bf69e3a34b6dd314feed2"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:be7ccc45c4d1a7dfb595f260e8022a90c6cb380c2a346ee5aae93f85c96d362b"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:8ba013500a2b68c64b2aecc5fb56a2dad6c2872cf545a0308fd044827b6e5f6a"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:4d9f7d10065f657f960b48699e7dddfce14ab91af4bab37a215f0722daf0d716"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7e24a1b802cea04160b3fccd75d2d0905065783ebc9de157d83c14fb9e1c6ce2"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-win32.whl", hash = "sha256:dffdf03499e0a5b3442951bb82b556333b069e0661e80568752786c79c5b32de"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:7d150d90a7c6caae7962f29f857a4e61d42038cfd82c9df38508daf30c648ae7"}, + {file = "rapidfuzz-2.15.1-cp310-cp310-win_arm64.whl", hash = "sha256:87c30e9184998ff6eb0fa9221f94282ce7c908fd0da96a1ef66ecadfaaa4cdb7"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:6986413cb37035eb796e32f049cbc8c13d8630a4ac1e0484e3e268bb3662bd1b"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a72f26e010d4774b676f36e43c0fc8a2c26659efef4b3be3fd7714d3491e9957"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b5cd54c98a387cca111b3b784fc97a4f141244bbc28a92d4bde53f164464112e"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da7fac7c3da39f93e6b2ebe386ed0ffe1cefec91509b91857f6e1204509e931f"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f976e76ac72f650790b3a5402431612175b2ac0363179446285cb3c901136ca9"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:abde47e1595902a490ed14d4338d21c3509156abb2042a99e6da51f928e0c117"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ca8f1747007a3ce919739a60fa95c5325f7667cccf6f1c1ef18ae799af119f5e"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c35da09ab9797b020d0d4f07a66871dfc70ea6566363811090353ea971748b5a"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a3a769ca7580686a66046b77df33851b3c2d796dc1eb60c269b68f690f3e1b65"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:d50622efefdb03a640a51a6123748cd151d305c1f0431af762e833d6ffef71f0"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:b7461b0a7651d68bc23f0896bffceea40f62887e5ab8397bf7caa883592ef5cb"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:074ee9e17912e025c72a5780ee4c7c413ea35cd26449719cc399b852d4e42533"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:7025fb105a11f503943f17718cdb8241ea3bb4d812c710c609e69bead40e2ff0"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-win32.whl", hash = "sha256:2084d36b95139413cef25e9487257a1cc892b93bd1481acd2a9656f7a1d9930c"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:5a738fcd24e34bce4b19126b92fdae15482d6d3a90bd687fd3d24ce9d28ce82d"}, + {file = "rapidfuzz-2.15.1-cp311-cp311-win_arm64.whl", hash = "sha256:dc3cafa68cfa54638632bdcadf9aab89a3d182b4a3f04d2cad7585ed58ea8731"}, + {file = "rapidfuzz-2.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3c53d57ba7a88f7bf304d4ea5a14a0ca112db0e0178fff745d9005acf2879f7d"}, + {file = "rapidfuzz-2.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a6ee758eec4cf2215dc8d8eafafcea0d1f48ad4b0135767db1b0f7c5c40a17dd"}, + {file = "rapidfuzz-2.15.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2d93ba3ae59275e7a3a116dac4ffdb05e9598bf3ee0861fecc5b60fb042d539e"}, + {file = "rapidfuzz-2.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7c3ff75e647908ddbe9aa917fbe39a112d5631171f3fcea5809e2363e525a59d"}, + {file = "rapidfuzz-2.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6d89c421702474c6361245b6b199e6e9783febacdbfb6b002669e6cb3ef17a09"}, + {file = "rapidfuzz-2.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f69e6199fec0f58f9a89afbbaea78d637c7ce77f656a03a1d6ea6abdc1d44f8"}, + {file = "rapidfuzz-2.15.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:41dfea282844d0628279b4db2929da0dacb8ac317ddc5dcccc30093cf16357c1"}, + {file = "rapidfuzz-2.15.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:2dd03477feefeccda07b7659dd614f6738cfc4f9b6779dd61b262a73b0a9a178"}, + {file = "rapidfuzz-2.15.1-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:5efe035aa76ff37d1b5fa661de3c4b4944de9ff227a6c0b2e390a95c101814c0"}, + {file = "rapidfuzz-2.15.1-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:ed2cf7c69102c7a0a06926d747ed855bc836f52e8d59a5d1e3adfd980d1bd165"}, + {file = "rapidfuzz-2.15.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:a0e441d4c2025110ec3eba5d54f11f78183269a10152b3a757a739ffd1bb12bf"}, + {file = "rapidfuzz-2.15.1-cp37-cp37m-win32.whl", hash = "sha256:a4a54efe17cc9f53589c748b53f28776dfdfb9bc83619685740cb7c37985ac2f"}, + {file = "rapidfuzz-2.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:bb8318116ecac4dfb84841d8b9b461f9bb0c3be5b616418387d104f72d2a16d1"}, + {file = "rapidfuzz-2.15.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e9296c530e544f68858c3416ad1d982a1854f71e9d2d3dcedb5b216e6d54f067"}, + {file = "rapidfuzz-2.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:49c4bcdb9238f11f8c4eba1b898937f09b92280d6f900023a8216008f299b41a"}, + {file = "rapidfuzz-2.15.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ebb40a279e134bb3fef099a8b58ed5beefb201033d29bdac005bddcdb004ef71"}, + {file = "rapidfuzz-2.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a7381c11cb590bbd4e6f2d8779a0b34fdd2234dfa13d0211f6aee8ca166d9d05"}, + {file = "rapidfuzz-2.15.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cfdcdedfd12a0077193f2cf3626ff6722c5a184adf0d2d51f1ec984bf21c23c3"}, + {file = "rapidfuzz-2.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f85bece1ec59bda8b982bd719507d468d4df746dfb1988df11d916b5e9fe19e8"}, + {file = "rapidfuzz-2.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b1b393f4a1eaa6867ffac6aef58cfb04bab2b3d7d8e40b9fe2cf40dd1d384601"}, + {file = "rapidfuzz-2.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:53de456ef020a77bf9d7c6c54860a48e2e902584d55d3001766140ac45c54bc7"}, + {file = "rapidfuzz-2.15.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2492330bc38b76ed967eab7bdaea63a89b6ceb254489e2c65c3824efcbf72993"}, + {file = "rapidfuzz-2.15.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:099e4c6befaa8957a816bdb67ce664871f10aaec9bebf2f61368cf7e0869a7a1"}, + {file = "rapidfuzz-2.15.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:46599b2ad4045dd3f794a24a6db1e753d23304699d4984462cf1ead02a51ddf3"}, + {file = "rapidfuzz-2.15.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:591f19d16758a3c55c9d7a0b786b40d95599a5b244d6eaef79c7a74fcf5104d8"}, + {file = "rapidfuzz-2.15.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ed17359061840eb249f8d833cb213942e8299ffc4f67251a6ed61833a9f2ea20"}, + {file = "rapidfuzz-2.15.1-cp38-cp38-win32.whl", hash = "sha256:aa1e5aad325168e29bf8e17006479b97024aa9d2fdbe12062bd2f8f09080acf8"}, + {file = "rapidfuzz-2.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:c2bb68832b140c551dbed691290bef4ee6719d4e8ce1b7226a3736f61a9d1a83"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:3fac40972cf7b6c14dded88ae2331eb50dfbc278aa9195473ef6fc6bfe49f686"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f0e456cbdc0abf39352800309dab82fd3251179fa0ff6573fa117f51f4e84be8"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:22b9d22022b9d09fd4ece15102270ab9b6a5cfea8b6f6d1965c1df7e3783f5ff"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:46754fe404a9a6f5cbf7abe02d74af390038d94c9b8c923b3f362467606bfa28"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:91abb8bf7610efe326394adc1d45e1baca8f360e74187f3fa0ef3df80cdd3ba6"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e40a2f60024f9d3c15401e668f732800114a023f3f8d8c40f1521a62081ff054"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a48ee83916401ac73938526d7bd804e01d2a8fe61809df7f1577b0b3b31049a3"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c71580052f9dbac443c02f60484e5a2e5f72ad4351b84b2009fbe345b1f38422"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:82b86d5b8c1b9bcbc65236d75f81023c78d06a721c3e0229889ff4ed5c858169"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:fc4528b7736e5c30bc954022c2cf410889abc19504a023abadbc59cdf9f37cae"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:e1e0e569108a5760d8f01d0f2148dd08cc9a39ead79fbefefca9e7c7723c7e88"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:94e1c97f0ad45b05003806f8a13efc1fc78983e52fa2ddb00629003acf4676ef"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:47e81767a962e41477a85ad7ac937e34d19a7d2a80be65614f008a5ead671c56"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-win32.whl", hash = "sha256:79fc574aaf2d7c27ec1022e29c9c18f83cdaf790c71c05779528901e0caad89b"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:f3dd4bcef2d600e0aa121e19e6e62f6f06f22a89f82ef62755e205ce14727874"}, + {file = "rapidfuzz-2.15.1-cp39-cp39-win_arm64.whl", hash = "sha256:cac095cbdf44bc286339a77214bbca6d4d228c9ebae3da5ff6a80aaeb7c35634"}, + {file = "rapidfuzz-2.15.1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b89d1126be65c85763d56e3b47d75f1a9b7c5529857b4d572079b9a636eaa8a7"}, + {file = "rapidfuzz-2.15.1-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:19b7460e91168229768be882ea365ba0ac7da43e57f9416e2cfadc396a7df3c2"}, + {file = "rapidfuzz-2.15.1-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:93c33c03e7092642c38f8a15ca2d8fc38da366f2526ec3b46adf19d5c7aa48ba"}, + {file = "rapidfuzz-2.15.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:040faca2e26d9dab5541b45ce72b3f6c0e36786234703fc2ac8c6f53bb576743"}, + {file = "rapidfuzz-2.15.1-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:6e2a3b23e1e9aa13474b3c710bba770d0dcc34d517d3dd6f97435a32873e3f28"}, + {file = "rapidfuzz-2.15.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:2e597b9dfd6dd180982684840975c458c50d447e46928efe3e0120e4ec6f6686"}, + {file = "rapidfuzz-2.15.1-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d14752c9dd2036c5f36ebe8db5f027275fa7d6b3ec6484158f83efb674bab84e"}, + {file = "rapidfuzz-2.15.1-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:558224b6fc6124d13fa32d57876f626a7d6188ba2a97cbaea33a6ee38a867e31"}, + {file = "rapidfuzz-2.15.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c89cfa88dc16fd8c9bcc0c7f0b0073f7ef1e27cceb246c9f5a3f7004fa97c4d"}, + {file = "rapidfuzz-2.15.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:509c5b631cd64df69f0f011893983eb15b8be087a55bad72f3d616b6ae6a0f96"}, + {file = "rapidfuzz-2.15.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:0f73a04135a03a6e40393ecd5d46a7a1049d353fc5c24b82849830d09817991f"}, + {file = "rapidfuzz-2.15.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8c99d53138a2dfe8ada67cb2855719f934af2733d726fbf73247844ce4dd6dd5"}, + {file = "rapidfuzz-2.15.1-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f01fa757f0fb332a1f045168d29b0d005de6c39ee5ce5d6c51f2563bb53c601b"}, + {file = "rapidfuzz-2.15.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:60368e1add6e550faae65614844c43f8a96e37bf99404643b648bf2dba92c0fb"}, + {file = "rapidfuzz-2.15.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:785744f1270828cc632c5a3660409dee9bcaac6931a081bae57542c93e4d46c4"}, + {file = "rapidfuzz-2.15.1.tar.gz", hash = "sha256:d62137c2ca37aea90a11003ad7dc109c8f1739bfbe5a9a217f3cdb07d7ac00f6"}, ] [package.extras] @@ -7144,8 +7147,6 @@ files = [ {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:045e0626baf1c52e5527bd5db361bc83180faaba2ff586e763d3d5982a876a9e"}, {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-macosx_12_6_arm64.whl", hash = "sha256:721bc4ba4525f53f6a611ec0967bdcee61b31df5a56801281027a3a6d1c2daf5"}, {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:41d0f1fa4c6830176eef5b276af04c89320ea616655d01327d5ce65e50575c94"}, - {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-win32.whl", hash = "sha256:f6d3d39611ac2e4f62c3128a9eed45f19a6608670c5a2f4f07f24e8de3441d38"}, - {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-win_amd64.whl", hash = "sha256:da538167284de58a52109a9b89b8f6a53ff8437dd6dc26d33b57bf6699153122"}, {file = "ruamel.yaml.clib-0.2.7-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:4b3a93bb9bc662fc1f99c5c3ea8e623d8b23ad22f861eb6fce9377ac07ad6072"}, {file = "ruamel.yaml.clib-0.2.7-cp36-cp36m-macosx_12_0_arm64.whl", hash = "sha256:a234a20ae07e8469da311e182e70ef6b199d0fbeb6c6cc2901204dd87fb867e8"}, {file = "ruamel.yaml.clib-0.2.7-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:15910ef4f3e537eea7fe45f8a5d19997479940d9196f357152a09031c5be59f3"}, @@ -7881,7 +7882,7 @@ numpy = {version = ">=1.17", markers = "python_version != \"3.10\" or platform_s packaging = ">=21.3" pandas = ">=0.25" patsy = ">=0.5.2" -scipy = {version = ">=1.3", markers = "python_version > \"3.7\" and python_version < \"3.12\" or platform_system != \"Windows\" and python_version < \"3.12\" or platform_machine != \"x86\" and python_version < \"3.12\""} +scipy = {version = ">=1.3", markers = "(python_version > \"3.7\" or platform_system != \"Windows\" or platform_machine != \"x86\") and python_version < \"3.12\""} [package.extras] build = ["cython (>=0.29.32)"] @@ -7931,7 +7932,7 @@ numpy = [ packaging = ">=21.3" pandas = ">=0.25" patsy = ">=0.5.2" -scipy = {version = ">=1.3", markers = "python_version > \"3.9\" and python_version < \"3.12\" or platform_system != \"Windows\" and python_version < \"3.12\" or platform_machine != \"x86\" and python_version < \"3.12\""} +scipy = {version = ">=1.3", markers = "(python_version > \"3.9\" or platform_system != \"Windows\" or platform_machine != \"x86\") and python_version < \"3.12\""} [package.extras] build = ["cython (>=0.29.32)"] @@ -9713,14 +9714,14 @@ test = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [extras] -all = ["Riskfolio-Lib", "lightgbm", "openai-whisper", "pytorch-lightning", "setuptools-rust", "torch", "transformers", "u8darts", "yt-dlp"] +all = ["torch", "pytorch-lightning", "u8darts", "Riskfolio-Lib", "lightgbm", "openai-whisper", "setuptools-rust", "transformers", "yt-dlp"] doc = ["docstring-parser"] -forecast = ["lightgbm", "openai-whisper", "pytorch-lightning", "setuptools-rust", "torch", "transformers", "u8darts", "yt-dlp"] +forecast = ["torch", "pytorch-lightning", "u8darts", "lightgbm", "openai-whisper", "setuptools-rust", "transformers", "yt-dlp"] installer = ["pyinstaller"] -jupyterlab = ["jedi-language-server", "jupyterlab-code-formatter", "jupyterlab-lsp"] +jupyterlab = ["jupyterlab-code-formatter", "jupyterlab-lsp", "jedi-language-server"] optimization = ["Riskfolio-Lib"] [metadata] lock-version = "2.0" python-versions = "^3.8,<3.11, !=3.9.7" -content-hash = "eea16610cfa778bbec55be286394c380ba5d73c906a56c0def649b0ba33e81a7" +content-hash = "4fb862090bfcd88fe8c101af9d53ee786ab384d61b6bfddf9079582e3ee47ea4" From 031550c4bc6c7282f17cf09f951b8d8284320142 Mon Sep 17 00:00:00 2001 From: James Maslek Date: Wed, 12 Apr 2023 10:18:37 -0400 Subject: [PATCH 38/38] reqs --- requirements-full.txt | 12 ++++++------ requirements.txt | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/requirements-full.txt b/requirements-full.txt index 4bde1b76cd48..b731d1fc7ab9 100644 --- a/requirements-full.txt +++ b/requirements-full.txt @@ -109,8 +109,8 @@ huggingface-hub==0.13.2 ; python_version >= "3.8" and python_full_version != "3. identify==2.5.21 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" idna==3.4 ; python_version >= "3.8" and python_version < "3.11" and python_full_version != "3.9.7" imagesize==1.4.1 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" -importlib-metadata==6.0.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" -importlib-resources==5.12.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.10" +importlib-metadata==6.0.0 ; python_full_version != "3.9.7" and python_version < "3.11" and python_version >= "3.8" +importlib-resources==5.12.0 ; python_full_version != "3.9.7" and python_version < "3.10" and python_version >= "3.8" inflection==0.5.1 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" iniconfig==2.0.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" interface-meta==1.3.0 ; python_version >= "3.8" and python_version < "3.11" and python_full_version != "3.9.7" @@ -261,7 +261,7 @@ python-i18n==0.3.9 ; python_version >= "3.8" and python_full_version != "3.9.7" pytorch-lightning==1.6.5 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" pytrends==4.9.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" pytz-deprecation-shim==0.1.0.post0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" -pytz==2022.7.1 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" +pytz==2022.7.1 ; python_full_version != "3.9.7" and python_version < "3.11" and python_version >= "3.8" 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" @@ -270,7 +270,7 @@ pyyaml==6.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and pyt 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" quandl==3.7.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" -rapidfuzz==2.13.7 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" +rapidfuzz==2.15.1 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" rdflib==6.2.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" regex==2022.10.31 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" reportlab==3.6.12 ; python_version >= "3.8" and python_version < "3.11" and python_full_version != "3.9.7" @@ -353,7 +353,7 @@ types-requests==2.28.11.15 ; python_version >= "3.8" and python_full_version != types-setuptools==57.4.18 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" types-six==1.16.21.7 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" types-urllib3==1.26.25.8 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" -typing-extensions==4.5.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" +typing-extensions==4.5.0 ; python_full_version != "3.9.7" and python_version < "3.11" and python_version >= "3.8" tzdata==2022.7 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" tzlocal==4.2 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" u8darts[torch]==0.23.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" @@ -385,5 +385,5 @@ yahooquery==2.3.0 ; python_version >= "3.8" and python_full_version != "3.9.7" a yarl==1.8.2 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" yfinance==0.2.12 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" yt-dlp==2023.3.4 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" -zipp==3.15.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" +zipp==3.15.0 ; python_full_version != "3.9.7" and python_version < "3.11" and python_version >= "3.8" zope-interface==5.5.2 ; 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 ffdafde04e26..5a4cda65b6cf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -76,7 +76,7 @@ holidays==0.14.2 ; python_version >= "3.8" and python_full_version != "3.9.7" an html5lib==1.1 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" idna==3.4 ; python_version >= "3.8" and python_version < "3.11" and python_full_version != "3.9.7" importlib-metadata==6.0.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" -importlib-resources==5.12.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.10" +importlib-resources==5.12.0 ; python_full_version != "3.9.7" and python_version < "3.10" and python_version >= "3.8" inflection==0.5.1 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" interface-meta==1.3.0 ; python_version >= "3.8" and python_version < "3.11" and python_full_version != "3.9.7" intrinio-sdk==6.22.2 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" @@ -180,14 +180,14 @@ python-dotenv==0.19.2 ; python_version >= "3.8" and python_full_version != "3.9. python-i18n==0.3.9 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" pytrends==4.9.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" pytz-deprecation-shim==0.1.0.post0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" -pytz==2022.7.1 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" +pytz==2022.7.1 ; python_full_version != "3.9.7" and python_version < "3.11" and python_version >= "3.8" 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.5 ; 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" -rapidfuzz==2.13.7 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" +rapidfuzz==2.15.1 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" rdflib==6.2.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" regex==2022.10.31 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" reportlab==3.6.12 ; python_version >= "3.8" and python_version < "3.11" and python_full_version != "3.9.7" @@ -235,7 +235,7 @@ tqdm==4.65.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and py tradingview-ta==3.3.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" traitlets==5.9.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" tweepy==4.13.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" -typing-extensions==4.5.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" +typing-extensions==4.5.0 ; python_full_version != "3.9.7" and python_version < "3.11" and python_version >= "3.8" tzdata==2022.7 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" tzlocal==4.2 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" ujson==5.7.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" @@ -258,5 +258,5 @@ y-py==0.6.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and pyt yahooquery==2.3.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" yarl==1.8.2 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" yfinance==0.2.12 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" -zipp==3.15.0 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11" +zipp==3.15.0 ; python_full_version != "3.9.7" and python_version < "3.11" and python_version >= "3.8" zope-interface==5.5.2 ; python_version >= "3.8" and python_full_version != "3.9.7" and python_version < "3.11"