diff --git a/README.md b/README.md index cbfa51a2e83af3255f0affa2debc2a727b8a8722..affa601c0c63be1b9fef44c09e37b182594bc67d 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 a4f9193937324acac7a7f4c9d4f8e97bb7e90bee..98d13b6b1df91bccca1c54270089d06a133d24b9 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 @@ -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 89e8208501b1b085f414a023ade6b8336e5865f2..30ad42cc3f35c8828412b4969477d28488ef641d 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,9 @@ 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"', + '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', @@ -21,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,