diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index c2a43228..10f85def 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -47,6 +47,10 @@ jobs: run: | poetry run black --diff --check . + - name: Import-check with isort + run: | + poetry run isort --diff --check-only . + - name: Lint with flake8 run: | poetry run flake8 --show-source --statistics . diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5cda6c9f..1632998b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,6 +9,16 @@ repos: files: ^src/|^tests/ types: [python] + - repo: local + hooks: + - id: python-import + name: isort + entry: poetry run isort + args: [--diff, --check-only] + language: system + files: ^src/|^tests/ + types: [python] + - repo: local hooks: - id: python-lint diff --git a/poetry.lock b/poetry.lock index d9e89864..64bdb899 100644 --- a/poetry.lock +++ b/poetry.lock @@ -179,13 +179,13 @@ xxhash = "*" apache-beam = ["apache-beam (>=2.26.0)"] audio = ["librosa"] benchmarks = ["numpy (==1.18.5)", "tensorflow (==2.3.0)", "torch (==1.6.0)", "transformers (==3.0.2)"] -dev = ["Pillow (>=6.2.1)", "Werkzeug (>=1.0.1)", "absl-py", "aiobotocore (>=2.0.1)", "apache-beam (>=2.26.0)", "bert-score (>=0.3.6)", "black (>=22.0,<23.0)", "boto3 (>=1.19.8)", "botocore (>=1.22.8)", "bs4", "conllu", "elasticsearch (<8.0.0)", "faiss-cpu (>=1.6.4)", "flake8 (>=3.8.3)", "fsspec", "h5py", "importlib-resources", "isort (>=5.0.0)", "jiwer", "langdetect", "librosa", "lxml", "lz4", "mauve-text", "moto[server,s3] (==2.0.4)", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "pytest", "pytest-datadir", "pytest-xdist", "pyyaml (>=5.3.1)", "rarfile (>=4.0)", "requests-file (>=1.5.1)", "rouge-score (<0.0.7)", "s3fs (>=2021.11.1)", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "six (>=1.15.0,<1.16.0)", "soundfile", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "texttable (>=1.6.3)", "tldextract", "tldextract (>=3.1.0)", "toml (>=0.10.1)", "torch", "torchaudio", "transformers", "zstandard"] +dev = ["Pillow (>=6.2.1)", "Werkzeug (>=1.0.1)", "absl-py", "aiobotocore (>=2.0.1)", "apache-beam (>=2.26.0)", "bert-score (>=0.3.6)", "black (>=22.0,<23.0)", "boto3 (>=1.19.8)", "botocore (>=1.22.8)", "bs4", "conllu", "elasticsearch (<8.0.0)", "faiss-cpu (>=1.6.4)", "flake8 (>=3.8.3)", "fsspec", "h5py", "importlib-resources", "isort (>=5.0.0)", "jiwer", "langdetect", "librosa", "lxml", "lz4", "mauve-text", "moto[s3,server] (==2.0.4)", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "pytest", "pytest-datadir", "pytest-xdist", "pyyaml (>=5.3.1)", "rarfile (>=4.0)", "requests-file (>=1.5.1)", "rouge-score (<0.0.7)", "s3fs (>=2021.11.1)", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "six (>=1.15.0,<1.16.0)", "soundfile", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "texttable (>=1.6.3)", "tldextract", "tldextract (>=3.1.0)", "toml (>=0.10.1)", "torch", "torchaudio", "transformers", "zstandard"] docs = ["s3fs"] quality = ["black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)"] s3 = ["boto3", "botocore", "fsspec", "s3fs"] tensorflow = ["tensorflow (>=2.2.0,!=2.6.0,!=2.6.1)"] tensorflow_gpu = ["tensorflow-gpu (>=2.2.0,!=2.6.0,!=2.6.1)"] -tests = ["Pillow (>=6.2.1)", "Werkzeug (>=1.0.1)", "absl-py", "aiobotocore (>=2.0.1)", "apache-beam (>=2.26.0)", "bert-score (>=0.3.6)", "boto3 (>=1.19.8)", "botocore (>=1.22.8)", "bs4", "conllu", "elasticsearch (<8.0.0)", "faiss-cpu (>=1.6.4)", "fsspec", "h5py", "importlib-resources", "jiwer", "langdetect", "librosa", "lxml", "lz4", "mauve-text", "moto[server,s3] (==2.0.4)", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "pytest", "pytest-datadir", "pytest-xdist", "rarfile (>=4.0)", "requests-file (>=1.5.1)", "rouge-score (<0.0.7)", "s3fs (>=2021.11.1)", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "six (>=1.15.0,<1.16.0)", "soundfile", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "texttable (>=1.6.3)", "tldextract", "tldextract (>=3.1.0)", "toml (>=0.10.1)", "torch", "torchaudio", "transformers", "zstandard"] +tests = ["Pillow (>=6.2.1)", "Werkzeug (>=1.0.1)", "absl-py", "aiobotocore (>=2.0.1)", "apache-beam (>=2.26.0)", "bert-score (>=0.3.6)", "boto3 (>=1.19.8)", "botocore (>=1.22.8)", "bs4", "conllu", "elasticsearch (<8.0.0)", "faiss-cpu (>=1.6.4)", "fsspec", "h5py", "importlib-resources", "jiwer", "langdetect", "librosa", "lxml", "lz4", "mauve-text", "moto[s3,server] (==2.0.4)", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "pytest", "pytest-datadir", "pytest-xdist", "rarfile (>=4.0)", "requests-file (>=1.5.1)", "rouge-score (<0.0.7)", "s3fs (>=2021.11.1)", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "six (>=1.15.0,<1.16.0)", "soundfile", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "texttable (>=1.6.3)", "tldextract", "tldextract (>=3.1.0)", "toml (>=0.10.1)", "torch", "torchaudio", "transformers", "zstandard"] torch = ["torch"] vision = ["Pillow (>=6.2.1)"] @@ -287,7 +287,7 @@ python-versions = ">=3.6" [[package]] name = "fsspec" -version = "2022.8.2" +version = "2022.10.0" description = "File-system specification" category = "main" optional = false @@ -428,6 +428,20 @@ parallel = ["ipyparallel"] qtconsole = ["qtconsole"] test = ["ipykernel", "nbformat", "nose (>=0.10.1)", "numpy (>=1.17)", "pygments", "requests", "testpath"] +[[package]] +name = "isort" +version = "5.10.1" +description = "A Python utility / library to sort Python imports." +category = "dev" +optional = false +python-versions = ">=3.6.1,<4.0" + +[package.extras] +colors = ["colorama (>=0.4.3,<0.5.0)"] +pipfile_deprecated_finder = ["pipreqs", "requirementslib"] +plugins = ["setuptools"] +requirements_deprecated_finder = ["pip-api", "pipreqs"] + [[package]] name = "jedi" version = "0.18.1" @@ -1221,7 +1235,7 @@ multidict = ">=4.0" [metadata] lock-version = "1.1" python-versions = "~3.8" -content-hash = "14e311f9fe9c21ae83e24bc5c38bb4c427b408001194503c643abbf069ce5e7c" +content-hash = "80d1d73a1a7b6958cf9a56be3982c853f09439d0b400625cd7a4c1a8eeb415e6" [metadata.files] aiohttp = [ @@ -1517,8 +1531,8 @@ frozenlist = [ {file = "frozenlist-1.2.0.tar.gz", hash = "sha256:68201be60ac56aff972dc18085800b6ee07973c49103a8aba669dee3d71079de"}, ] fsspec = [ - {file = "fsspec-2022.8.2-py3-none-any.whl", hash = "sha256:6374804a2c0d24f225a67d009ee1eabb4046ad00c793c3f6df97e426c890a1d9"}, - {file = "fsspec-2022.8.2.tar.gz", hash = "sha256:7f12b90964a98a7e921d27fb36be536ea036b73bf3b724ac0b0bd7b8e39c7c18"}, + {file = "fsspec-2022.10.0-py3-none-any.whl", hash = "sha256:6b7c6ab3b476cdf17efcfeccde7fca28ef5a48f73a71010aaceec5fc15bf9ebf"}, + {file = "fsspec-2022.10.0.tar.gz", hash = "sha256:cb6092474e90487a51de768170f3afa50ca8982c26150a59072b16433879ff1d"}, ] gitdb = [ {file = "gitdb-4.0.9-py3-none-any.whl", hash = "sha256:8033ad4e853066ba6ca92050b9df2f89301b8fc8bf7e9324d412a63f8bf1a8fd"}, @@ -1547,6 +1561,10 @@ ipython = [ {file = "ipython-7.30.0-py3-none-any.whl", hash = "sha256:c8f3e07aefb9cf9e067f39686f035ce09b27a1ee602116a3030b91b6fc138ee4"}, {file = "ipython-7.30.0.tar.gz", hash = "sha256:d41f8e80b99690122400f9b2069b12f670246a1b4cc5d332bd6c4e2500e6d6fb"}, ] +isort = [ + {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"}, + {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"}, +] jedi = [ {file = "jedi-0.18.1-py2.py3-none-any.whl", hash = "sha256:637c9635fcf47945ceb91cd7f320234a7be540ded6f3e99a50cb6febdfd1ba8d"}, {file = "jedi-0.18.1.tar.gz", hash = "sha256:74137626a64a99c8eb6ae5832d99b3bdd7d29a3850fe2aa80a4126b2a7d949ab"}, @@ -1782,7 +1800,6 @@ prompt-toolkit = [ {file = "prompt_toolkit-3.0.23.tar.gz", hash = "sha256:7053aba00895473cb357819358ef33f11aa97e4ac83d38efb123e5649ceeecaf"}, ] protobuf = [ - {file = "protobuf-3.20.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:9f876a69ca55aed879b43c295a328970306e8e80a263ec91cf6e9189243c613b"}, {file = "protobuf-3.20.2-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:09e25909c4297d71d97612f04f41cea8fa8510096864f2835ad2f3b3df5a5559"}, {file = "protobuf-3.20.2-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e8fbc522303e09036c752a0afcc5c0603e917222d8bedc02813fd73b4b4ed804"}, {file = "protobuf-3.20.2-cp310-cp310-win32.whl", hash = "sha256:84a1544252a933ef07bb0b5ef13afe7c36232a774affa673fc3636f7cee1db6c"}, diff --git a/pyproject.toml b/pyproject.toml index cffbf2b9..179a8c8e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,6 +28,7 @@ flake8 = "^5.0.4" shellcheck-py = "^0.8.0" shfmt-py = "^3.4.3" pytest-mock = "^3.8.2" +isort = "^5.10.1" [build-system] requires = ["poetry-core>=1.0.0"] @@ -48,6 +49,12 @@ extend-exclude = """ )/ """ +[tool.isort] +profile = "black" +skip_glob = ["data/*", "runs/*", "scripts/*", + "submodules/*", ".venv/*", "cov_html/*"] +line_length = 88 + [tool.coverage.run] branch = true source = ["src"] diff --git a/requirements-dev.txt b/requirements-dev.txt index 16bce9f2..288628bd 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -19,7 +19,7 @@ evaluate==0.2.2; python_full_version >= "3.7.0" filelock==3.4.0; python_version >= "3.6" and python_full_version >= "3.7.0" flake8==5.0.4; python_full_version >= "3.6.1" frozenlist==1.2.0; python_version >= "3.6" -fsspec==2022.8.2; python_version >= "3.7" and python_full_version >= "3.7.0" +fsspec==2022.10.0; python_version >= "3.7" and python_full_version >= "3.7.0" gitdb==4.0.9; python_version >= "3.7" gitpython==3.1.27; python_version >= "3.7" huggingface-hub==0.9.1; python_full_version >= "3.7.0" @@ -27,6 +27,7 @@ idna==3.3; python_version >= "3.6" and python_full_version >= "3.7.0" and (pytho iniconfig==1.1.1; python_version >= "3.7" ipdb==0.13.9; python_version >= "2.7" ipython==7.30.0; python_version >= "3.7" +isort==5.10.1; python_full_version >= "3.6.1" and python_version < "4.0" jedi==0.18.1; python_version >= "3.7" joblib==1.1.0; python_version >= "3.8" matplotlib-inline==0.1.3; python_version >= "3.7" diff --git a/requirements.txt b/requirements.txt index 611beca6..960902c3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ docker-pycreds==0.4.0; python_version >= "3.6" evaluate==0.2.2; python_full_version >= "3.7.0" filelock==3.4.0; python_version >= "3.6" and python_full_version >= "3.7.0" frozenlist==1.2.0; python_version >= "3.6" -fsspec==2022.8.2; python_version >= "3.7" and python_full_version >= "3.7.0" +fsspec==2022.10.0; python_version >= "3.7" and python_full_version >= "3.7.0" gitdb==4.0.9; python_version >= "3.7" gitpython==3.1.27; python_version >= "3.7" huggingface-hub==0.9.1; python_full_version >= "3.7.0" diff --git a/src/parser.py b/src/parser.py index 8fb8e402..e791a19d 100644 --- a/src/parser.py +++ b/src/parser.py @@ -1,11 +1,12 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from transformers.hf_argparser import DataClassType -from transformers import HfArgumentParser, TrainingArguments +import os from dataclasses import dataclass, field from typing import Optional -import os + +from transformers import HfArgumentParser, TrainingArguments +from transformers.hf_argparser import DataClassType # 1. NOTE: Fields with no default value set will be transformed # into`required arguments within the HuggingFace argument parser diff --git a/src/privacy_glue.py b/src/privacy_glue.py index e5e1b9d4..344ec3f4 100644 --- a/src/privacy_glue.py +++ b/src/privacy_glue.py @@ -2,6 +2,7 @@ # -*- coding: utf-8 -*- from parser import get_parser + from utils.experiment_utils import Privacy_GLUE_Experiment_Manager diff --git a/src/tasks/opp_115.py b/src/tasks/opp_115.py index 8a12aeff..8dd460fd 100644 --- a/src/tasks/opp_115.py +++ b/src/tasks/opp_115.py @@ -1,9 +1,10 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +import os + import datasets import pandas as pd -import os def load_opp_115(directory: str) -> datasets.DatasetDict: diff --git a/src/tasks/piextract.py b/src/tasks/piextract.py index 331a476a..e6abdbc9 100644 --- a/src/tasks/piextract.py +++ b/src/tasks/piextract.py @@ -1,10 +1,11 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from typing import Dict, List, Tuple +import os from glob import glob +from typing import Dict, List, Tuple + import datasets -import os def read_conll_file(file_path: str) -> Dict[str, List[List[str]]]: diff --git a/src/tasks/policy_detection.py b/src/tasks/policy_detection.py index b4f1ee24..7153c263 100644 --- a/src/tasks/policy_detection.py +++ b/src/tasks/policy_detection.py @@ -1,10 +1,11 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -import pandas as pd -import datasets import os +import datasets +import pandas as pd + def load_policy_detection(directory: str) -> datasets.DatasetDict: # initialize DatasetDict object diff --git a/src/tasks/policy_ie_a.py b/src/tasks/policy_ie_a.py index 92f76f5e..f05b2986 100644 --- a/src/tasks/policy_ie_a.py +++ b/src/tasks/policy_ie_a.py @@ -1,9 +1,10 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +import os from typing import Dict, cast + import datasets -import os def file_mapping(directory: str, filename: str) -> Dict[str, str]: diff --git a/src/tasks/policy_ie_b.py b/src/tasks/policy_ie_b.py index ec2d847f..f0e6fe97 100644 --- a/src/tasks/policy_ie_b.py +++ b/src/tasks/policy_ie_b.py @@ -1,10 +1,12 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from .policy_ie_a import file_mapping from typing import cast + import datasets +from .policy_ie_a import file_mapping + def load_policy_ie_b(directory: str) -> datasets.DatasetDict: # initialize DatasetDict object diff --git a/src/tasks/policy_qa.py b/src/tasks/policy_qa.py index 4c9f1691..7d616043 100644 --- a/src/tasks/policy_qa.py +++ b/src/tasks/policy_qa.py @@ -1,11 +1,12 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from typing import Dict, List, Any -from glob import glob -import datasets import json import os +from glob import glob +from typing import Any, Dict, List + +import datasets def load_policy_qa(directory: str) -> datasets.DatasetDict: diff --git a/src/tasks/privacy_qa.py b/src/tasks/privacy_qa.py index 96dc03ee..ff05de72 100644 --- a/src/tasks/privacy_qa.py +++ b/src/tasks/privacy_qa.py @@ -1,10 +1,11 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -import pandas as pd -import datasets import os +import datasets +import pandas as pd + def load_privacy_qa(directory: str) -> datasets.DatasetDict: # load and process the train dataset diff --git a/src/utils/experiment_utils.py b/src/utils/experiment_utils.py index 7ac44bc6..c8666325 100644 --- a/src/utils/experiment_utils.py +++ b/src/utils/experiment_utils.py @@ -1,13 +1,15 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +import os +import re +from parser import TASKS + from wandb.util import generate_id + +from reading_comprehension import Reading_Comprehension_Pipeline from sequence_classification import Sequence_Classification_Pipeline from sequence_tagging import Sequence_Tagging_Pipeline -from reading_comprehension import Reading_Comprehension_Pipeline -from parser import TASKS -import os -import re class Privacy_GLUE_Experiment_Manager: diff --git a/src/utils/parser_utils.py b/src/utils/parser_utils.py index a8c52085..e14462b8 100644 --- a/src/utils/parser_utils.py +++ b/src/utils/parser_utils.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from typing import Iterable, Optional, cast -from operator import attrgetter import argparse import os import re +from operator import attrgetter +from typing import Iterable, Optional, cast def dir_path(path: str) -> str: diff --git a/src/utils/pipeline_utils.py b/src/utils/pipeline_utils.py index 42d77955..cbc8075d 100644 --- a/src/utils/pipeline_utils.py +++ b/src/utils/pipeline_utils.py @@ -1,12 +1,21 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +import logging +import os +import shutil from abc import ABC, abstractmethod -from datasets import DatasetDict from glob import glob +from parser import DataArguments, ModelArguments + +import datasets +import torch +import transformers +import wandb +from datasets import DatasetDict from transformers import TrainingArguments, set_seed from transformers.trainer_utils import get_last_checkpoint -from parser import DataArguments, ModelArguments + from tasks.opp_115 import load_opp_115 from tasks.piextract import load_piextract from tasks.policy_detection import load_policy_detection @@ -14,14 +23,7 @@ from tasks.policy_ie_b import load_policy_ie_b from tasks.policy_qa import load_policy_qa from tasks.privacy_qa import load_privacy_qa -from utils.logging_utils import init_logger, add_file_handler -import transformers -import datasets -import logging -import wandb -import shutil -import torch -import os +from utils.logging_utils import add_file_handler, init_logger class SuccessFileFoundException(Exception): diff --git a/tests/conftest.py b/tests/conftest.py index bf269c26..6fd5b035 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,14 +1,15 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from types import SimpleNamespace +import logging +import os +from copy import deepcopy from functools import partial +from types import SimpleNamespace from unittest.mock import MagicMock -from copy import deepcopy + import datasets -import logging import pytest -import os def pytest_configure(): diff --git a/tests/tasks/test_opp_115.py b/tests/tasks/test_opp_115.py index 13bd6e85..c8f20e1c 100644 --- a/tests/tasks/test_opp_115.py +++ b/tests/tasks/test_opp_115.py @@ -1,9 +1,10 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from tasks.opp_115 import load_opp_115 import os +from tasks.opp_115 import load_opp_115 + def test_load_opp_115(): # load sample data diff --git a/tests/tasks/test_piextract.py b/tests/tasks/test_piextract.py index 13d07f8f..054cef57 100644 --- a/tests/tasks/test_piextract.py +++ b/tests/tasks/test_piextract.py @@ -1,10 +1,12 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from tasks.piextract import load_piextract, merge_ner_tags, read_conll_file +import os + import datasets import pytest -import os + +from tasks.piextract import load_piextract, merge_ner_tags, read_conll_file def mocked_conll_output(): diff --git a/tests/tasks/test_policy_detection.py b/tests/tasks/test_policy_detection.py index d2a654a9..a5f169f5 100644 --- a/tests/tasks/test_policy_detection.py +++ b/tests/tasks/test_policy_detection.py @@ -1,10 +1,12 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from tasks.policy_detection import load_policy_detection -import datasets import os +import datasets + +from tasks.policy_detection import load_policy_detection + def test_load_policy_detection(): # load sample data diff --git a/tests/tasks/test_policy_ie_a.py b/tests/tasks/test_policy_ie_a.py index 89ed3cd5..a253bc15 100644 --- a/tests/tasks/test_policy_ie_a.py +++ b/tests/tasks/test_policy_ie_a.py @@ -1,9 +1,10 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from tasks.policy_ie_a import load_policy_ie_a import os +from tasks.policy_ie_a import load_policy_ie_a + def test_load_policy_ie_a(): # load sample data diff --git a/tests/tasks/test_policy_ie_b.py b/tests/tasks/test_policy_ie_b.py index 952f7d0e..fa841f16 100644 --- a/tests/tasks/test_policy_ie_b.py +++ b/tests/tasks/test_policy_ie_b.py @@ -1,9 +1,10 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from tasks.policy_ie_b import load_policy_ie_b import os +from tasks.policy_ie_b import load_policy_ie_b + def test_load_policy_ie_b(): # load sample data diff --git a/tests/tasks/test_policy_qa.py b/tests/tasks/test_policy_qa.py index 64596c1a..3991987e 100644 --- a/tests/tasks/test_policy_qa.py +++ b/tests/tasks/test_policy_qa.py @@ -1,9 +1,10 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from tasks.policy_qa import load_policy_qa import os +from tasks.policy_qa import load_policy_qa + def test_load_policy_qa(): # load sample data diff --git a/tests/tasks/test_privacy_qa.py b/tests/tasks/test_privacy_qa.py index e4cf81c6..55d184d6 100644 --- a/tests/tasks/test_privacy_qa.py +++ b/tests/tasks/test_privacy_qa.py @@ -1,10 +1,12 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from tasks.privacy_qa import load_privacy_qa -import datasets import os +import datasets + +from tasks.privacy_qa import load_privacy_qa + def test_load_privacy_qa(): # load sample data diff --git a/tests/test_parser.py b/tests/test_parser.py index 8d75af0e..899e58a2 100644 --- a/tests/test_parser.py +++ b/tests/test_parser.py @@ -1,14 +1,15 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +import tempfile from parser import ( - ModelArguments, DataArguments, - TrainingArguments, ExperimentArguments, + ModelArguments, + TrainingArguments, get_parser, ) -import tempfile + import pytest diff --git a/tests/utils/test_experiment_utils.py b/tests/utils/test_experiment_utils.py index 476ecedb..23a3fdcc 100644 --- a/tests/utils/test_experiment_utils.py +++ b/tests/utils/test_experiment_utils.py @@ -1,10 +1,12 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from utils.experiment_utils import Privacy_GLUE_Experiment_Manager -import pytest import os +import pytest + +from utils.experiment_utils import Privacy_GLUE_Experiment_Manager + def test__init__(): experiment_manager = Privacy_GLUE_Experiment_Manager( diff --git a/tests/utils/test_logging_utils.py b/tests/utils/test_logging_utils.py index 8c98736f..c20e2d2a 100644 --- a/tests/utils/test_logging_utils.py +++ b/tests/utils/test_logging_utils.py @@ -1,16 +1,18 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +import logging +import os +import tempfile + +import pytest + from utils.logging_utils import ( - init_logger, + FORMATTER, add_file_handler, + init_logger, remove_all_file_handlers, - FORMATTER, ) -import logging -import pytest -import tempfile -import os @pytest.mark.parametrize( diff --git a/tests/utils/test_parser_utils.py b/tests/utils/test_parser_utils.py index 8845bd1b..66236234 100644 --- a/tests/utils/test_parser_utils.py +++ b/tests/utils/test_parser_utils.py @@ -1,11 +1,13 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from utils.parser_utils import dir_path, file_path -import tempfile import argparse +import tempfile + import pytest +from utils.parser_utils import dir_path, file_path + def test_dir_path(): # check when directory exists diff --git a/tests/utils/test_pipeline_utils.py b/tests/utils/test_pipeline_utils.py index 05f7f542..87bcdf23 100644 --- a/tests/utils/test_pipeline_utils.py +++ b/tests/utils/test_pipeline_utils.py @@ -1,13 +1,15 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from utils.pipeline_utils import Privacy_GLUE_Pipeline, SuccessFileFoundException -import transformers -import datasets import logging -import pytest import os +import datasets +import pytest +import transformers + +from utils.pipeline_utils import Privacy_GLUE_Pipeline, SuccessFileFoundException + class Mocked_Pipeline(Privacy_GLUE_Pipeline): def _retrieve_data(self):