From 179c15edb8c68178f4473d14e38602f26b6c1d26 Mon Sep 17 00:00:00 2001 From: Mateusz Klimaszewski <mk.klimaszewski@gmail.com> Date: Mon, 18 Jan 2021 12:12:36 +0100 Subject: [PATCH 1/3] Fix sentencepiece version per python version. --- docs/installation.md | 4 +++- setup.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/installation.md b/docs/installation.md index a4f9193..f6c3fff 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -21,7 +21,9 @@ Run `conda install -c conda-forge jsonnet=0.15.0` and re-run installation. * No package 'sentencepiece' found -Run `pip install sentencepiece==0.1.83` and re-run installation. +Run `pip install sentencepiece==0.1.83` for Python < 3.8 and re-run installation. + +Run `pip install sentencepiece==0.1.85` for Python >= 3.8 and re-run installation. * Missing Cython error diff --git a/setup.py b/setup.py index 89e8208..a66027f 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,8 @@ REQUIREMENTS = [ 'numpy==1.19.4', 'overrides==3.1.0', 'requests==2.23.0', - 'sentencepiece==0.1.83', + 'sentencepiece==0.1.83;python_version<"3.8"', + 'sentencepiece==0.1.85;python_version>="3.8"', 'spacy==2.3.2', 'scikit-learn<=0.23.2', 'torch==1.6.0', -- GitLab From 069f16ace7b08d8ece4f8596964c270080a9cb73 Mon Sep 17 00:00:00 2001 From: Mateusz Klimaszewski <mk.klimaszewski@gmail.com> Date: Mon, 18 Jan 2021 12:29:24 +0100 Subject: [PATCH 2/3] Limit SciPy 1.6.0 for Python 3.6. --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index a66027f..2fc2e40 100644 --- a/setup.py +++ b/setup.py @@ -12,6 +12,7 @@ REQUIREMENTS = [ 'requests==2.23.0', 'sentencepiece==0.1.83;python_version<"3.8"', 'sentencepiece==0.1.85;python_version>="3.8"', + 'scipy<1.6.0;python_version<"3.7"', # SciPy 1.6.0 works for 3.7+ 'spacy==2.3.2', 'scikit-learn<=0.23.2', 'torch==1.6.0', -- GitLab From 320b4a96bd54f5df20c7938946500a886b42ae61 Mon Sep 17 00:00:00 2001 From: Mateusz Klimaszewski <mk.klimaszewski@gmail.com> Date: Mon, 18 Jan 2021 12:13:27 +0100 Subject: [PATCH 3/3] Release 1.0.1. --- README.md | 2 +- docs/installation.md | 4 ++-- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cbfa51a..affa601 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Clone this repository and install COMBO (we suggest creating a virtualenv/conda environment with Python 3.6+, as a bundle of required packages will be installed): ```bash pip install -U pip setuptools wheel -pip install --index-url https://pypi.clarin-pl.eu/simple combo==1.0.0 +pip install --index-url https://pypi.clarin-pl.eu/simple combo==1.0.1 ``` Run the following commands in your Python console to make predictions with a pre-trained model: ```python diff --git a/docs/installation.md b/docs/installation.md index f6c3fff..98d13b6 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -2,7 +2,7 @@ Clone this repository and install COMBO (we suggest using virtualenv/conda with Python 3.6+): ```bash pip install -U pip setuptools wheel -pip install --index-url https://pypi.clarin-pl.eu/simple combo==1.0.0 +pip install --index-url https://pypi.clarin-pl.eu/simple combo==1.0.1 combo --helpfull ``` @@ -11,7 +11,7 @@ combo --helpfull python -m venv venv source venv/bin/activate pip install -U pip setuptools wheel -pip install --index-url https://pypi.clarin-pl.eu/simple combo==1.0.0 +pip install --index-url https://pypi.clarin-pl.eu/simple combo==1.0.1 ``` ## Problems & solutions diff --git a/setup.py b/setup.py index 2fc2e40..30ad42c 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ REQUIREMENTS = [ setup( name='combo', - version='1.0.0', + version='1.0.1', author='Mateusz Klimaszewski', author_email='M.Klimaszewski@ii.pw.edu.pl', install_requires=REQUIREMENTS, -- GitLab