From 4496b975dace85fb0021f9156bc34ba2fd192aa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pszenny?= <pszenny@e-science.pl> Date: Fri, 9 Sep 2022 16:28:25 +0000 Subject: [PATCH] Variable name fix in download.py dependency update setting encoding to utf-8 Update dataset.py Update setup.py Update dataset.py --- combo/data/dataset.py | 2 +- combo/utils/download.py | 2 +- setup.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/combo/data/dataset.py b/combo/data/dataset.py index bdc8b20..cb8824b 100644 --- a/combo/data/dataset.py +++ b/combo/data/dataset.py @@ -82,7 +82,7 @@ class UniversalDependenciesDatasetReader(allen_data.DatasetReader): for conllu_file in file_path: file = pathlib.Path(conllu_file) assert conllu_file and file.exists(), f"File with path '{conllu_file}' does not exists!" - with file.open("r") as f: + with file.open("r", encoding="utf-8") as f: for annotation in conllu.parse_incr(f, fields=self.fields, field_parsers=self.field_parsers): yield self.text_to_instance(annotation) diff --git a/combo/utils/download.py b/combo/utils/download.py index 03f310d..5c7ce6f 100644 --- a/combo/utils/download.py +++ b/combo/utils/download.py @@ -23,7 +23,7 @@ _CACHE_DIR = os.getenv("COMBO_DIR", os.path.join(_HOME_DIR, ".combo")) def download_file(model_name, force=False): _make_cache_dir() data = model_name.split("-")[-1] - url = _URL.format(name=model_name, data=DATA_TO_PATH[data]) + url = _URL.format(model=model_name, data=DATA_TO_PATH[data]) local_filename = url.split("/")[-1] location = os.path.join(_CACHE_DIR, local_filename) if os.path.exists(location) and not force: diff --git a/setup.py b/setup.py index 207c822..9817ec7 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ REQUIREMENTS = [ 'conllu==2.3.2', 'dataclasses;python_version<"3.7"', 'jsonnet==0.15.0', - 'filelock==3.0;python_version>="3.9"', + 'filelock==3.0', 'numpy==1.22.0', 'overrides==3.1.0', 'requests==2.23.0', @@ -53,4 +53,4 @@ setup( 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', ] -) \ No newline at end of file +) -- GitLab