From 4361e01611ded1bdace8abfe98cf97532c9a0f7c Mon Sep 17 00:00:00 2001 From: Abhinav Arora Date: Thu, 17 Feb 2022 09:30:40 -0800 Subject: [PATCH 1/3] Remove unnecessary select option in flake8 configs --- .flake8 | 1 - 1 file changed, 1 deletion(-) diff --git a/.flake8 b/.flake8 index 2ae4feedc7..b4f4b18fa8 100644 --- a/.flake8 +++ b/.flake8 @@ -1,5 +1,4 @@ [flake8] ignore = E401,E402,E501,E722,W503,W504,F821,B006,B007,B008,B009 -select = D417 # Missing argument descriptions in the docstring max-line-length = 120 exclude = docs/source,third_party From fc0c345e8d941cf0fecbae46b3a1f99e12910d69 Mon Sep 17 00:00:00 2001 From: Abhinav Arora Date: Thu, 17 Feb 2022 09:39:46 -0800 Subject: [PATCH 2/3] Flake8 select all lint options that we care about --- .flake8 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.flake8 b/.flake8 index b4f4b18fa8..837ead9061 100644 --- a/.flake8 +++ b/.flake8 @@ -1,4 +1,7 @@ [flake8] ignore = E401,E402,E501,E722,W503,W504,F821,B006,B007,B008,B009 +select = + B,C,E,F,P,T4,W,B9, + D417 # Missing argument descriptions in the docstring max-line-length = 120 exclude = docs/source,third_party From 38cbfd2fe0e6063d64633ba3e7bdc25cc0087383 Mon Sep 17 00:00:00 2001 From: Abhinav Arora Date: Thu, 17 Feb 2022 09:47:00 -0800 Subject: [PATCH 3/3] Fix Flake8 errors --- .flake8 | 4 +++- torchtext/data/datasets_utils.py | 7 +------ torchtext/datasets/ag_news.py | 2 -- torchtext/datasets/conll2000chunking.py | 2 -- torchtext/datasets/squad1.py | 2 -- torchtext/datasets/squad2.py | 2 -- 6 files changed, 4 insertions(+), 15 deletions(-) diff --git a/.flake8 b/.flake8 index 837ead9061..e09b485892 100644 --- a/.flake8 +++ b/.flake8 @@ -1,5 +1,7 @@ [flake8] -ignore = E401,E402,E501,E722,W503,W504,F821,B006,B007,B008,B009 +ignore = + E401,E402,E501,E722,W503,W504,F821,B006,B007,B008,B009, + E203 # https://github.com/PyCQA/pycodestyle/issues/373 select = B,C,E,F,P,T4,W,B9, D417 # Missing argument descriptions in the docstring diff --git a/torchtext/data/datasets_utils.py b/torchtext/data/datasets_utils.py index 208de20a2f..425eafcea6 100644 --- a/torchtext/data/datasets_utils.py +++ b/torchtext/data/datasets_utils.py @@ -7,12 +7,7 @@ import torch from torch.utils.data import functional_datapipe, IterDataPipe from torch.utils.data.datapipes.utils.common import StreamWrapper -from torchtext.utils import download_from_url, extract_archive, unicode_csv_reader, validate_file -from torchtext.utils import ( - validate_file, - download_from_url, - extract_archive, -) +from torchtext.utils import download_from_url, extract_archive, validate_file try: import defusedxml.ElementTree as ET diff --git a/torchtext/datasets/ag_news.py b/torchtext/datasets/ag_news.py index 0b657b37bf..ed0ba775c7 100644 --- a/torchtext/datasets/ag_news.py +++ b/torchtext/datasets/ag_news.py @@ -11,8 +11,6 @@ from torchdata.datapipes.iter import FileOpener, HttpReader, IterableWrapper -from torchtext.data.datasets_utils import _add_docstring_header, _create_dataset_directory, _wrap_split_argument - URL = { "train": "https://raw.githubusercontent.com/mhjabreel/CharCnn_Keras/master/data/ag_news_csv/train.csv", "test": "https://raw.githubusercontent.com/mhjabreel/CharCnn_Keras/master/data/ag_news_csv/test.csv", diff --git a/torchtext/datasets/conll2000chunking.py b/torchtext/datasets/conll2000chunking.py index 51bfe46217..a2fe130df9 100644 --- a/torchtext/datasets/conll2000chunking.py +++ b/torchtext/datasets/conll2000chunking.py @@ -11,8 +11,6 @@ from torchdata.datapipes.iter import FileOpener, HttpReader, IterableWrapper -from torchtext.data.datasets_utils import _add_docstring_header, _create_dataset_directory, _wrap_split_argument - URL = { "train": "https://www.clips.uantwerpen.be/conll2000/chunking/train.txt.gz", "test": "https://www.clips.uantwerpen.be/conll2000/chunking/test.txt.gz", diff --git a/torchtext/datasets/squad1.py b/torchtext/datasets/squad1.py index 5f31b32621..3f9b4aa8a4 100644 --- a/torchtext/datasets/squad1.py +++ b/torchtext/datasets/squad1.py @@ -11,8 +11,6 @@ from torchdata.datapipes.iter import FileOpener, HttpReader, IterableWrapper -from torchtext.data.datasets_utils import _add_docstring_header, _create_dataset_directory, _wrap_split_argument - URL = { "train": "https://rajpurkar.github.io/SQuAD-explorer/dataset/train-v1.1.json", "dev": "https://rajpurkar.github.io/SQuAD-explorer/dataset/dev-v1.1.json", diff --git a/torchtext/datasets/squad2.py b/torchtext/datasets/squad2.py index 80f73e57a3..67e7bdf411 100644 --- a/torchtext/datasets/squad2.py +++ b/torchtext/datasets/squad2.py @@ -11,8 +11,6 @@ from torchdata.datapipes.iter import FileOpener, HttpReader, IterableWrapper -from torchtext.data.datasets_utils import _add_docstring_header, _create_dataset_directory, _wrap_split_argument - URL = { "train": "https://rajpurkar.github.io/SQuAD-explorer/dataset/train-v2.0.json", "dev": "https://rajpurkar.github.io/SQuAD-explorer/dataset/dev-v2.0.json",