update: requirements (#1578)

IgnatovFedor · web-flow · commit caa1f639f06d · 2022-07-04T15:27:59.000+03:00
diff --git a/deeppavlov/core/common/file.py b/deeppavlov/core/common/file.py
@@ -19,8 +19,6 @@
 from pathlib import Path
 from typing import Union, Any
 
-from ruamel.yaml import YAML
-
 from deeppavlov.core.common.aliases import ALIASES
 
 log = getLogger(__name__)
@@ -69,9 +67,3 @@ def save_pickle(data: dict, fpath: Union[str, Path]) -> None:
 def load_pickle(fpath: Union[str, Path]) -> Any:
     with open(fpath, 'rb') as fin:
         return pickle.load(fin)
-
-
-def read_yaml(fpath: Union[str, Path]) -> dict:
-    yaml = YAML(typ="safe")
-    with open(fpath, encoding='utf8') as fin:
-        return yaml.load(fin)
diff --git a/deeppavlov/core/common/registry.json b/deeppavlov/core/common/registry.json
@@ -95,7 +95,6 @@
   "torch_transformers_preprocessor": "deeppavlov.models.preprocessors.torch_transformers_preprocessor:TorchTransformersPreprocessor",
   "torch_transformers_sequence_tagger": "deeppavlov.models.torch_bert.torch_transformers_sequence_tagger:TorchTransformersSequenceTagger",
   "torch_transformers_squad": "deeppavlov.models.torch_bert.torch_transformers_squad:TorchTransformersSquad",
-  "torchtext_classification_data_reader": "deeppavlov.dataset_readers.torchtext_classification_data_reader:TorchtextClassificationDataReader",
   "transformers_bert_embedder": "deeppavlov.models.embedders.transformers_embedder:TransformersBertEmbedder",
   "transformers_bert_preprocessor": "deeppavlov.models.preprocessors.transformers_preprocessor:TransformersBertPreprocessor",
   "tree_to_sparql": "deeppavlov.models.kbqa.tree_to_sparql:TreeToSparql",
diff --git a/deeppavlov/core/common/requirements_registry.json b/deeppavlov/core/common/requirements_registry.json
@@ -1,8 +1,7 @@
 {
   "answer_types_extractor": [
     "{DEEPPAVLOV_PATH}/requirements/en_core_web_sm.txt",
-    "{DEEPPAVLOV_PATH}/requirements/ru_core_news_sm.txt",
-    "{DEEPPAVLOV_PATH}/requirements/spacy.txt"
+    "{DEEPPAVLOV_PATH}/requirements/ru_core_news_sm.txt"
   ],
   "entity_linker": [
     "{DEEPPAVLOV_PATH}/requirements/hdt.txt",
@@ -28,12 +27,13 @@
     "{DEEPPAVLOV_PATH}/requirements/pytorch.txt",
     "{DEEPPAVLOV_PATH}/requirements/transformers.txt"
   ],
+  "nltk_moses_tokenizer": [
+    "{DEEPPAVLOV_PATH}/requirements/sacremoses.txt"
+  ],
   "query_generator": [
-    "{DEEPPAVLOV_PATH}/requirements/bs4.txt",
     "{DEEPPAVLOV_PATH}/requirements/en_core_web_sm.txt",
     "{DEEPPAVLOV_PATH}/requirements/hdt.txt",
     "{DEEPPAVLOV_PATH}/requirements/rapidfuzz.txt",
-    "{DEEPPAVLOV_PATH}/requirements/spacy.txt",
     "{DEEPPAVLOV_PATH}/requirements/whapi.txt"
   ],
   "re_classifier": [
@@ -51,8 +51,7 @@
   ],
   "rel_ranking_infer": [
     "{DEEPPAVLOV_PATH}/requirements/en_core_web_sm.txt",
-    "{DEEPPAVLOV_PATH}/requirements/hdt.txt",
-    "{DEEPPAVLOV_PATH}/requirements/spacy.txt"
+    "{DEEPPAVLOV_PATH}/requirements/hdt.txt"
   ],
   "rel_ranking_preprocessor": [
     "{DEEPPAVLOV_PATH}/requirements/pytorch.txt",
@@ -77,8 +76,7 @@
     "{DEEPPAVLOV_PATH}/requirements/lxml.txt"
   ],
   "stream_spacy_tokenizer": [
-    "{DEEPPAVLOV_PATH}/requirements/en_core_web_sm.txt",
-    "{DEEPPAVLOV_PATH}/requirements/spacy.txt"
+    "{DEEPPAVLOV_PATH}/requirements/en_core_web_sm.txt"
   ],
   "torch_bert_ranker": [
     "{DEEPPAVLOV_PATH}/requirements/pytorch.txt",
@@ -140,9 +138,6 @@
     "{DEEPPAVLOV_PATH}/requirements/pytorch.txt",
     "{DEEPPAVLOV_PATH}/requirements/transformers.txt"
   ],
-  "torchtext_classification_data_reader": [
-    "{DEEPPAVLOV_PATH}/requirements/torchtext.txt"
-  ],
   "transformers_bert_embedder": [
     "{DEEPPAVLOV_PATH}/requirements/pytorch.txt",
     "{DEEPPAVLOV_PATH}/requirements/transformers.txt"
diff --git a/deeppavlov/dataset_readers/torchtext_classification_data_reader.py b/deeppavlov/dataset_readers/torchtext_classification_data_reader.py
diff --git a/deeppavlov/requirements/bs4.txt b/deeppavlov/requirements/bs4.txt
diff --git a/deeppavlov/requirements/datasets.txt b/deeppavlov/requirements/datasets.txt
@@ -1 +1 @@
-datasets==1.11.0
+datasets>=1.16.0,<2.4.0
diff --git a/deeppavlov/requirements/en_core_web_sm.txt b/deeppavlov/requirements/en_core_web_sm.txt
@@ -1 +1,2 @@
-https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.2.0/en_core_web_sm-3.2.0.tar.gz#egg=en_core_web_sm==3.2.0
+https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.3.0/en_core_web_sm-3.3.0-py3-none-any.whl
+spacy
diff --git a/deeppavlov/requirements/fasttext.txt b/deeppavlov/requirements/fasttext.txt
@@ -1 +1 @@
-fasttext==0.9.1
+fasttext==0.9.*
diff --git a/deeppavlov/requirements/hdt.txt b/deeppavlov/requirements/hdt.txt
@@ -1,3 +1 @@
-# TODO: hdt has pybind11 in requirements but imports it in the setup.py before installation. Should be fixed.
-# fasttext==0.9.1 installs pybind11==2.9.1. If install pybind11==2.2.4 after that two times, second installation will raise error Cannot uninstall pybind11 2.9.1, RECORD file not found.
 hdt==2.3
diff --git a/deeppavlov/requirements/lxml.txt b/deeppavlov/requirements/lxml.txt
@@ -1 +1 @@
-lxml==4.4.2
+lxml==4.9.*
diff --git a/deeppavlov/requirements/opt_einsum.txt b/deeppavlov/requirements/opt_einsum.txt
@@ -1 +1 @@
-opt-einsum==3.3.0
+opt-einsum==3.3.*
diff --git a/deeppavlov/requirements/pytorch.txt b/deeppavlov/requirements/pytorch.txt
@@ -1 +1 @@
-torch>=1.6.0,<=1.8.0
+torch>=1.6.0,<1.13.0
diff --git a/deeppavlov/requirements/rapidfuzz.txt b/deeppavlov/requirements/rapidfuzz.txt
@@ -1 +1 @@
-rapidfuzz==0.7.6
+rapidfuzz==2.1.*
diff --git a/deeppavlov/requirements/ru_core_news_sm.txt b/deeppavlov/requirements/ru_core_news_sm.txt
@@ -1 +1,2 @@
-https://github.com/explosion/spacy-models/releases/download/ru_core_news_sm-3.2.0/ru_core_news_sm-3.2.0.tar.gz#egg=ru_core_news_sm==3.2.0
+https://github.com/explosion/spacy-models/releases/download/ru_core_news_sm-3.3.0/ru_core_news_sm-3.3.0-py3-none-any.whl
+spacy
diff --git a/deeppavlov/requirements/sacremoses.txt b/deeppavlov/requirements/sacremoses.txt
@@ -0,0 +1 @@
+sacremoses==0.0.53
diff --git a/deeppavlov/requirements/slovnet.txt b/deeppavlov/requirements/slovnet.txt
@@ -1,2 +1,2 @@
-slovnet==0.5.0
-navec==0.10.0
+slovnet==0.5.*
+navec
diff --git a/deeppavlov/requirements/sortedcontainers.txt b/deeppavlov/requirements/sortedcontainers.txt
@@ -1 +1 @@
-sortedcontainers==2.1.0
+sortedcontainers==2.4.*
diff --git a/deeppavlov/requirements/spacy.txt b/deeppavlov/requirements/spacy.txt
diff --git a/deeppavlov/requirements/torchcrf.txt b/deeppavlov/requirements/torchcrf.txt
@@ -1 +1 @@
-pytorch-crf==0.7.2
+pytorch-crf==0.7.*
diff --git a/deeppavlov/requirements/torchtext.txt b/deeppavlov/requirements/torchtext.txt
diff --git a/deeppavlov/requirements/transformers.txt b/deeppavlov/requirements/transformers.txt
@@ -1 +1 @@
-transformers==4.6.0
+transformers>=4.13.0,<4.21.0
diff --git a/deeppavlov/requirements/udapi.txt b/deeppavlov/requirements/udapi.txt
@@ -1 +1 @@
-git+https://github.com/udapi/udapi-python.git@1e4004f577f3c6e471528ce4b87dd570ce8f2706
+udapi==0.3.*
diff --git a/deeppavlov/requirements/whapi.txt b/deeppavlov/requirements/whapi.txt
@@ -1 +1,2 @@
-whapi<=0.6.2
+bs4
+whapi==0.6.*
diff --git a/requirements.txt b/requirements.txt
@@ -1,25 +1,16 @@
-aio-pika>=3.2.2,<=6.8.2
-Cython>=0.25.2,<=0.29.27
-fastapi<=0.73.0
-filelock>=3.0.6,<=3.4.2
-h5py>=2.6.0,<=3.6.0
-nltk>=3.2.5,<=3.6.7
-numpy<=1.22.2
-overrides<=4.1.2
-pandas<=1.4.0
-prometheus-client<=0.13.1
-protobuf<4
-pytz<=2021.3
-pydantic<=1.9.0
-pymorphy2<=0.9.1
-pymorphy2-dicts-ru
-pyopenssl<=22.0.0
-requests<=2.27.1
-ruamel.yaml<=0.17.20
-scikit-learn>=0.24,<=1.0.2
-scipy<=1.7.3
-tqdm<=4.62.3
-click<=8.0.3
-uvicorn<=0.17.4
-sacremoses<=0.0.47
-uvloop<=0.14.0; python_version=="3.6"
+aio-pika>=3.2.2,<6.9.0
+fastapi>=0.47.0,<0.78.0
+filelock>=3.0.0,<3.8.0
+nltk>=3.2.5,<3.8.0
+numpy
+overrides==4.1.2
+pandas>=1.0.0,<1.5.0
+prometheus-client>=0.13.0,<0.15.0
+pydantic
+pymorphy2==0.9.1
+pybind11==2.2.4
+requests>=2.19.0,<3.0.0
+scikit-learn>=0.24,<1.1.0
+scipy<1.9.0
+tqdm>=4.42.0,<4.65.0
+uvicorn>=0.13.0,<0.19.0

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-datasets==1.11.0`
	`1`	`+datasets>=1.16.0,<2.4.0`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.2.0/en_core_web_sm-3.2.0.tar.gz#egg=en_core_web_sm==3.2.0`
	`1`	`+https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.3.0/en_core_web_sm-3.3.0-py3-none-any.whl`
	`2`	`+spacy`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1 @@`
`1`		`-# TODO: hdt has pybind11 in requirements but imports it in the setup.py before installation. Should be fixed.`
`2`		`-# fasttext==0.9.1 installs pybind11==2.9.1. If install pybind11==2.2.4 after that two times, second installation will raise error Cannot uninstall pybind11 2.9.1, RECORD file not found.`
`3`	`1`	`hdt==2.3`