diff --git a/pyproject.toml b/pyproject.toml index f51575c345724adad021d889b42f4e7a9cafeafc..eaed4a6deed3ef59646f2158fc25a08b5039887d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,29 +4,28 @@ build-backend = "hatchling.build" [project] name = "lambo" -version = "2.0.0" +version = "2.1.0" authors = [ { name="Piotr PrzybyĆa", email="piotr.przybyla@ipipan.waw.pl" }, ] description = "A multi-lingual text segmentation tool/" readme = "README.md" -requires-python = ">=3.6.9" +requires-python = ">=3.10" classifiers = [ "Programming Language :: Python :: 3", "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Operating System :: OS Independent", ] dependencies = [ - 'torch >= 1.7.1, < 2', - 'importlib-resources >= 3.3.0, < 6', - 'requests >= 2.22.0, < 3', - 'tqdm >= 4.43.0, < 5', - 'urllib3 >= 1.22, <2', - 'numpy >= 1.21.0, < 2', + 'torch >= 2.1, < 3', + 'requests >= 2.31, < 3', + 'tqdm >= 4.31, < 5', + 'urllib3 >= 1.26.18, <2', + 'numpy >= 1.23, < 2', ] [project.optional-dependencies] -spacy = [ 'spacy >= 3.0.3, < 4', ] +spacy = [ 'spacy >= 3.5.3, < 4', ] [project.urls] diff --git a/src/lambo/examples/run_evaluation.py b/src/lambo/examples/run_evaluation.py index 2fdfbe173411a88bcdf90efb8bfa4d56f6d679d8..1ca8e2b6921415ee5a387978ff6434c1505c992f 100644 --- a/src/lambo/examples/run_evaluation.py +++ b/src/lambo/examples/run_evaluation.py @@ -3,7 +3,7 @@ Evaluation of available model by comparing to UD gold standard """ from pathlib import Path -import importlib_resources as resources +import importlib.resources as resources from lambo.evaluation.evaluate import evaluate_segmenter from lambo.segmenter.lambo import Lambo diff --git a/src/lambo/examples/run_pretraining.py b/src/lambo/examples/run_pretraining.py index 2c724f408b35a8d8f964f4087fdf00fd91ead4ea..d0c4f621a221c480982a2b84174de559a319f9e2 100644 --- a/src/lambo/examples/run_pretraining.py +++ b/src/lambo/examples/run_pretraining.py @@ -4,7 +4,7 @@ Script from pretraining models using OSCAR corpora import gzip from urllib.error import HTTPError -import importlib_resources as resources +import importlib.resources as resources from pathlib import Path import torch diff --git a/src/lambo/examples/run_training.py b/src/lambo/examples/run_training.py index 5676f365d2049fce86349966c1882fd59d3c6f6e..7e93e59d4e4c24a31b4fec9011510792ec991336 100644 --- a/src/lambo/examples/run_training.py +++ b/src/lambo/examples/run_training.py @@ -3,7 +3,7 @@ Script for training LAMBO models using UD data """ import sys -import importlib_resources as resources +import importlib.resources as resources from pathlib import Path import torch diff --git a/src/lambo/examples/run_training_pretrained.py b/src/lambo/examples/run_training_pretrained.py index 9cc6b2bb0be8df0aafe09032d4b503458d5b2bc3..471251a0fea5a57548d514b6c3dcc45bc2a06e1e 100644 --- a/src/lambo/examples/run_training_pretrained.py +++ b/src/lambo/examples/run_training_pretrained.py @@ -4,7 +4,7 @@ Script for training LAMBO models using UD data from pretrained import sys from pathlib import Path -import importlib_resources as resources +import importlib.resources as resources import torch from lambo.learning.train import train_new_and_save, train_pretrained_and_save diff --git a/src/lambo/examples/run_training_splitting.py b/src/lambo/examples/run_training_splitting.py index 038c17d3477d736c9f6756d3f104454cd037f90c..0b0cf0c6075094a92ce53695dab9e3c9dc9ffedc 100644 --- a/src/lambo/examples/run_training_splitting.py +++ b/src/lambo/examples/run_training_splitting.py @@ -4,7 +4,7 @@ Script for training LAMBO subword splitting models using UD data from pretrained import time, sys from pathlib import Path -import importlib_resources as resources +import importlib.resources as resources import torch from lambo.segmenter.lambo import Lambo diff --git a/src/lambo/segmenter/lambo.py b/src/lambo/segmenter/lambo.py index e481fb973f0920b74508fd34d27014c8f55126af..7e8e6346772b3ce61af9ea903cd430af99b54586 100644 --- a/src/lambo/segmenter/lambo.py +++ b/src/lambo/segmenter/lambo.py @@ -1,6 +1,6 @@ import re -import importlib_resources as resources +import importlib.resources as resources import torch from lambo.data.document import Document diff --git a/src/lambo/utils/special_tokens.py b/src/lambo/utils/special_tokens.py index 9b06bf75ccb8eb6e3bb800106e2a4e3e1b030be9..1a3106b8d24cabd35402273b06cbacdfb8608696 100644 --- a/src/lambo/utils/special_tokens.py +++ b/src/lambo/utils/special_tokens.py @@ -5,7 +5,7 @@ Detects special tokens, i.e. text fragments that should always be included in a """ import re -import importlib_resources as resources +import importlib.resources as resources emoji_file_str = resources.read_text('lambo.resources', 'emoji.tab', encoding='utf-8', errors='strict') emojis = [line.split('\t')[0] for line in emoji_file_str.split('\n') if len(line) > 0]