From ada9091ee6d707971440a1140d32fc1648d68add Mon Sep 17 00:00:00 2001 From: oscar-king Date: Tue, 14 Jun 2022 17:52:58 +0100 Subject: [PATCH 1/3] Update setup.py Add missing dependency scikit-learn --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 493213d85e..3880593a3b 100644 --- a/setup.py +++ b/setup.py @@ -19,6 +19,7 @@ "pandas>=1.2.3", # Needed for CLI fine-tuning data preparation tool "pandas-stubs>=1.1.0.11", # Needed for type hints for mypy "openpyxl>=3.0.7", # Needed for CLI fine-tuning data preparation tool xlsx format + "scikit-learn>=1.1.1" # Needed for embedding utils ], extras_require={"dev": ["black~=21.6b0", "pytest==6.*"]}, python_requires=">=3.7.1", From 2e921167ab10506836c8b266c55f22e1dc81860c Mon Sep 17 00:00:00 2001 From: oscar-king Date: Tue, 14 Jun 2022 18:36:46 +0100 Subject: [PATCH 2/3] Update setup.py Versioning issue fix --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3880593a3b..201e6812a2 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,8 @@ "pandas>=1.2.3", # Needed for CLI fine-tuning data preparation tool "pandas-stubs>=1.1.0.11", # Needed for type hints for mypy "openpyxl>=3.0.7", # Needed for CLI fine-tuning data preparation tool xlsx format - "scikit-learn>=1.1.1" # Needed for embedding utils + "scikit-learn==1.0.2", # Needed for embedding utils, versions >= 1.1 require python 3.8 + "tenacity==8.0.1" ], extras_require={"dev": ["black~=21.6b0", "pytest==6.*"]}, python_requires=">=3.7.1", From 072e66377245e3dce9b38ff86f45ca006d12df23 Mon Sep 17 00:00:00 2001 From: oscar-king Date: Mon, 27 Jun 2022 17:08:51 +0200 Subject: [PATCH 3/3] Added requirements into extras_require --- setup.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 201e6812a2..d1110c6c19 100644 --- a/setup.py +++ b/setup.py @@ -18,11 +18,15 @@ "tqdm", # Needed for progress bars "pandas>=1.2.3", # Needed for CLI fine-tuning data preparation tool "pandas-stubs>=1.1.0.11", # Needed for type hints for mypy - "openpyxl>=3.0.7", # Needed for CLI fine-tuning data preparation tool xlsx format - "scikit-learn==1.0.2", # Needed for embedding utils, versions >= 1.1 require python 3.8 - "tenacity==8.0.1" + "openpyxl>=3.0.7" # Needed for CLI fine-tuning data preparation tool xlsx format ], - extras_require={"dev": ["black~=21.6b0", "pytest==6.*"]}, + extras_require={ + "dev": ["black~=21.6b0", "pytest==6.*"], + "embeddings": [ + "scikit-learn>=1.0.2", # Needed for embedding utils, versions >= 1.1 require python 3.8 + "tenacity>=8.0.1" + ], + }, python_requires=">=3.7.1", entry_points={ "console_scripts": [