From 07d0b2c630d2dfdfb4510e689cc7105a64ae9607 Mon Sep 17 00:00:00 2001 From: kuldeepkhatke Date: Sun, 5 Sep 2021 00:01:28 +0530 Subject: [PATCH 1/2] Updated flake8 based code quality changes for Tests --- tests/_data/test.py | 39 ++++++------ tests/_data_duplicated_deps/db.py | 4 +- tests/_data_ignore/.ignore_second/ignored.py | 2 +- tests/_data_ignore/.ignored_dir/ignored.py | 2 +- tests/_data_ignore/test.py | 66 ++++++++++---------- tests/_invalid_data/invalid.py | 2 +- tests/test_pipreqs.py | 5 +- 7 files changed, 64 insertions(+), 56 deletions(-) diff --git a/tests/_data/test.py b/tests/_data/test.py index fdb6ec3..ffd32dc 100644 --- a/tests/_data/test.py +++ b/tests/_data/test.py @@ -1,32 +1,34 @@ """unused import""" -# pylint: disable=undefined-all-variable, import-error, no-absolute-import, too-few-public-methods, missing-docstring +# pylint: disable=undefined-all-variable, import-error, no-absolute-import +# pylint: disable=too-few-public-methods, missing-docstring +from __future__ import print_function # noqa:F401 import xml.etree # [unused-import] -import xml.sax # [unused-import] -import os.path as test # [unused-import] -from sys import argv as test2 # [unused-import] -from sys import flags # [unused-import] +import xml.sax # noqa:F401 # [unused-import] +import os.path as test # noqa:F401 # [unused-import] +from sys import argv as test2 # noqa:F401 # [unused-import] +from sys import flags # noqa:F401 # [unused-import] # +1:[unused-import,unused-import] -from collections import deque, OrderedDict, Counter +from collections import deque, OrderedDict, Counter # noqa:F401 # All imports above should be ignored -import requests # [unused-import] +import requests # noqa:F401 # [unused-import] # setuptools import zipimport # command/easy_install.py # twisted -from importlib import invalidate_caches # python/test/test_deprecate.py +from importlib import invalidate_caches # noqa:F401, E501 # python/test/test_deprecate.py # astroid -import zipimport # manager.py +import zipimport # noqa:F401, F811 # manager.py # IPython -from importlib.machinery import all_suffixes # core/completerlib.py -import importlib # html/notebookapp.py +from importlib.machinery import all_suffixes # noqa:F401, E501 # core/completerlib.py +import importlib # noqa:F401 # html/notebookapp.py -from IPython.utils.importstring import import_item # Many files +from IPython.utils.importstring import import_item # noqa:F401 # Many files # pyflakes # test/test_doctests.py -from pyflakes.test.test_imports import Test as TestImports +from pyflakes.test.test_imports import Test as TestImports # noqa:F401 # Nose from nose.importer import Importer, add_path, remove_path # loader.py @@ -49,17 +51,18 @@ import bs4 import nonexistendmodule import boto as b, peewee as p # import django -import flask.ext.somext # # # -from sqlalchemy import model +import flask.ext.somext # noqa:F401 # # # +from sqlalchemy import model # noqa:F401 try: import ujson as json except ImportError: - import json + import json # noqa:F401 -import models +import models # noqa:F401 def main(): pass -import after_method_is_valid_even_if_not_pep8 + +import after_method_is_valid_even_if_not_pep8 # noqa:F401, E402 diff --git a/tests/_data_duplicated_deps/db.py b/tests/_data_duplicated_deps/db.py index 5e2a360..79911c1 100644 --- a/tests/_data_duplicated_deps/db.py +++ b/tests/_data_duplicated_deps/db.py @@ -1,5 +1,5 @@ -import pymongo -from bson.objectid import ObjectId +import pymongo # noqa:F401 +from bson.objectid import ObjectId # noqa:F401 # 'bson' package is mapped to 'pymongo'. # But running pipreqs should not result in two duplicated diff --git a/tests/_data_ignore/.ignore_second/ignored.py b/tests/_data_ignore/.ignore_second/ignored.py index b970ae3..dc3ac5d 100644 --- a/tests/_data_ignore/.ignore_second/ignored.py +++ b/tests/_data_ignore/.ignore_second/ignored.py @@ -1,2 +1,2 @@ # Everything in here should be ignored -from pattern.web import Twitter, plaintext \ No newline at end of file +from pattern.web import Twitter, plaintext # noqa:F401 diff --git a/tests/_data_ignore/.ignored_dir/ignored.py b/tests/_data_ignore/.ignored_dir/ignored.py index 8765306..abc255e 100644 --- a/tests/_data_ignore/.ignored_dir/ignored.py +++ b/tests/_data_ignore/.ignored_dir/ignored.py @@ -1,2 +1,2 @@ # Everything in here should be ignored -import click \ No newline at end of file +import click # noqa:F401 diff --git a/tests/_data_ignore/test.py b/tests/_data_ignore/test.py index cfd039c..5605028 100644 --- a/tests/_data_ignore/test.py +++ b/tests/_data_ignore/test.py @@ -1,61 +1,63 @@ """unused import""" -# pylint: disable=undefined-all-variable, import-error, no-absolute-import, too-few-public-methods, missing-docstring +# pylint: disable=undefined-all-variable, import-error, no-absolute-import +# pylint: disable=too-few-public-methods, missing-docstring +from __future__ import print_function # noqa:F401 import xml.etree # [unused-import] -import xml.sax # [unused-import] -import os.path as test # [unused-import] -from sys import argv as test2 # [unused-import] -from sys import flags # [unused-import] +import xml.sax # noqa:F401 # [unused-import] +import os.path as test # noqa:F401 # [unused-import] +from sys import argv as test2 # noqa:F401 # [unused-import] +from sys import flags # noqa:F401 # [unused-import] # +1:[unused-import,unused-import] -from collections import deque, OrderedDict, Counter +from collections import deque, OrderedDict, Counter # noqa:F401 # All imports above should be ignored -import requests # [unused-import] +import requests # noqa:F401 # [unused-import] # setuptools import zipimport # command/easy_install.py # twisted -from importlib import invalidate_caches # python/test/test_deprecate.py +from importlib import invalidate_caches # noqa:F401, E501 # python/test/test_deprecate.py # astroid -import zipimport # manager.py +import zipimport # noqa:F401, F811 # manager.py # IPython -from importlib.machinery import all_suffixes # core/completerlib.py -import importlib # html/notebookapp.py +from importlib.machinery import all_suffixes # noqa:F401, E501 # core/completerlib.py +import importlib # noqa:F401 # html/notebookapp.py -from IPython.utils.importstring import import_item # Many files +from IPython.utils.importstring import import_item # noqa:F401 # Many files # pyflakes # test/test_doctests.py -from pyflakes.test.test_imports import Test as TestImports +from pyflakes.test.test_imports import Test as TestImports # noqa:F401 # Nose -from nose.importer import Importer, add_path, remove_path # loader.py +from nose.importer import Importer, add_path, remove_path # noqa:F401, E501 # loader.py -import atexit -from __future__ import print_function -from docopt import docopt -import curses, logging, sqlite3 -import logging -import os -import sqlite3 -import time -import sys -import signal -import bs4 -import nonexistendmodule -import boto as b, peewee as p +import atexit # noqa:F401 +from docopt import docopt # noqa:F401 +import curses, logging, sqlite3 # noqa:F401, E401 +import logging # noqa:F401, F811 +import os # noqa:F401 +import sqlite3 # noqa:F401, F811 +import time # noqa:F401 +import sys # noqa:F401 +import signal # noqa:F401 +import bs4 # noqa:F401 +import nonexistendmodule # noqa:F401 +import boto as b, peewee as p # noqa:F401, E401 # import django -import flask.ext.somext # # # -from sqlalchemy import model +import flask.ext.somext # noqa:F401 # # # +from sqlalchemy import model # noqa:F401 try: import ujson as json except ImportError: - import json + import json # noqa:F401 -import models +import models # noqa:F401 def main(): pass -import after_method_is_valid_even_if_not_pep8 + +import after_method_is_valid_even_if_not_pep8 # noqa:F401, E402 diff --git a/tests/_invalid_data/invalid.py b/tests/_invalid_data/invalid.py index aa3e849..cb1b44d 100644 --- a/tests/_invalid_data/invalid.py +++ b/tests/_invalid_data/invalid.py @@ -1 +1 @@ -import boto as b, import peewee as p, +import boto as b, import peewee as p, # noqa:E401, E999 diff --git a/tests/test_pipreqs.py b/tests/test_pipreqs.py index f82d3db..ab11c04 100644 --- a/tests/test_pipreqs.py +++ b/tests/test_pipreqs.py @@ -212,7 +212,10 @@ class TestPipreqs(unittest.TestCase): '--mode': None } ) - with open(os.path.join(self.project_with_ignore_directory, "requirements.txt"), "r") as f: + with open( + os.path.join( + self.project_with_ignore_directory, "requirements.txt" + ), "r") as f: data = f.read().lower() for item in ['click', 'getpass']: self.assertFalse(item.lower() in data) From d49ba8230179e371aef76d4b15ffdde9c8296286 Mon Sep 17 00:00:00 2001 From: kuldeepkhatke Date: Tue, 7 Sep 2021 10:31:54 +0530 Subject: [PATCH 2/2] Fixed conflicts & updated flake8 to conflicted files --- tests/_data/test.py | 31 +++++---- tests/_data_clean/test.py | 70 ++++++++++---------- tests/test_pipreqs.py | 132 ++++++++++++++++++++++---------------- 3 files changed, 129 insertions(+), 104 deletions(-) diff --git a/tests/_data/test.py b/tests/_data/test.py index ffd32dc..204da10 100644 --- a/tests/_data/test.py +++ b/tests/_data/test.py @@ -31,25 +31,24 @@ from IPython.utils.importstring import import_item # noqa:F401 # Many files from pyflakes.test.test_imports import Test as TestImports # noqa:F401 # Nose -from nose.importer import Importer, add_path, remove_path # loader.py +from nose.importer import Importer, add_path, remove_path # noqa:F401, E501 # loader.py # see issue #88 -import analytics -import flask_seasurf +import analytics # noqa:F401 +import flask_seasurf # noqa:F401 -import atexit -from __future__ import print_function -from docopt import docopt -import curses, logging, sqlite3 -import logging -import os -import sqlite3 -import time -import sys -import signal -import bs4 -import nonexistendmodule -import boto as b, peewee as p +import atexit # noqa:F401 +from docopt import docopt # noqa:F401 +import curses, logging, sqlite3 # noqa:F401, E401 +import logging # noqa:F401, F811 +import os # noqa:F401 +import sqlite3 # noqa:F401, F811 +import time # noqa:F401 +import sys # noqa:F401 +import signal # noqa:F401 +import bs4 # noqa:F401 +import nonexistendmodule # noqa:F401 +import boto as b, peewee as p # noqa:F401, E401 # import django import flask.ext.somext # noqa:F401 # # # from sqlalchemy import model # noqa:F401 diff --git a/tests/_data_clean/test.py b/tests/_data_clean/test.py index 8cffb51..204da10 100644 --- a/tests/_data_clean/test.py +++ b/tests/_data_clean/test.py @@ -1,65 +1,67 @@ """unused import""" -# pylint: disable=undefined-all-variable, import-error, no-absolute-import, too-few-public-methods, missing-docstring +# pylint: disable=undefined-all-variable, import-error, no-absolute-import +# pylint: disable=too-few-public-methods, missing-docstring +from __future__ import print_function # noqa:F401 import xml.etree # [unused-import] -import xml.sax # [unused-import] -import os.path as test # [unused-import] -from sys import argv as test2 # [unused-import] -from sys import flags # [unused-import] +import xml.sax # noqa:F401 # [unused-import] +import os.path as test # noqa:F401 # [unused-import] +from sys import argv as test2 # noqa:F401 # [unused-import] +from sys import flags # noqa:F401 # [unused-import] # +1:[unused-import,unused-import] -from collections import deque, OrderedDict, Counter +from collections import deque, OrderedDict, Counter # noqa:F401 # All imports above should be ignored -import requests # [unused-import] +import requests # noqa:F401 # [unused-import] # setuptools import zipimport # command/easy_install.py # twisted -from importlib import invalidate_caches # python/test/test_deprecate.py +from importlib import invalidate_caches # noqa:F401, E501 # python/test/test_deprecate.py # astroid -import zipimport # manager.py +import zipimport # noqa:F401, F811 # manager.py # IPython -from importlib.machinery import all_suffixes # core/completerlib.py -import importlib # html/notebookapp.py +from importlib.machinery import all_suffixes # noqa:F401, E501 # core/completerlib.py +import importlib # noqa:F401 # html/notebookapp.py -from IPython.utils.importstring import import_item # Many files +from IPython.utils.importstring import import_item # noqa:F401 # Many files # pyflakes # test/test_doctests.py -from pyflakes.test.test_imports import Test as TestImports +from pyflakes.test.test_imports import Test as TestImports # noqa:F401 # Nose -from nose.importer import Importer, add_path, remove_path # loader.py +from nose.importer import Importer, add_path, remove_path # noqa:F401, E501 # loader.py # see issue #88 -import analytics -import flask_seasurf +import analytics # noqa:F401 +import flask_seasurf # noqa:F401 -import atexit -from __future__ import print_function -from docopt import docopt -import curses, logging, sqlite3 -import logging -import os -import sqlite3 -import time -import sys -import signal -import bs4 -import nonexistendmodule -import boto as b, peewee as p +import atexit # noqa:F401 +from docopt import docopt # noqa:F401 +import curses, logging, sqlite3 # noqa:F401, E401 +import logging # noqa:F401, F811 +import os # noqa:F401 +import sqlite3 # noqa:F401, F811 +import time # noqa:F401 +import sys # noqa:F401 +import signal # noqa:F401 +import bs4 # noqa:F401 +import nonexistendmodule # noqa:F401 +import boto as b, peewee as p # noqa:F401, E401 # import django -import flask.ext.somext # # # -# from sqlalchemy import model +import flask.ext.somext # noqa:F401 # # # +from sqlalchemy import model # noqa:F401 try: import ujson as json except ImportError: - import json + import json # noqa:F401 -import models +import models # noqa:F401 def main(): pass -import after_method_is_valid_even_if_not_pep8 + +import after_method_is_valid_even_if_not_pep8 # noqa:F401, E402 diff --git a/tests/test_pipreqs.py b/tests/test_pipreqs.py index ab11c04..be7b54f 100644 --- a/tests/test_pipreqs.py +++ b/tests/test_pipreqs.py @@ -113,9 +113,11 @@ class TestPipreqs(unittest.TestCase): """ Test that all modules we will test upon are in requirements file """ - pipreqs.init({'': self.project, '--savepath': None, '--print': False, - '--use-local': None, '--force': True, '--proxy':None, '--pypi-server':None, - '--diff': None, '--clean': None, '--mode': None}) + pipreqs.init({ + '': self.project, '--savepath': None, '--print': False, + '--use-local': None, '--force': True, '--proxy': None, + '--pypi-server': None, '--diff': None, '--clean': None, + '--mode': None}) assert os.path.exists(self.requirements_path) == 1 with open(self.requirements_path, "r") as f: data = f.read().lower() @@ -130,9 +132,11 @@ class TestPipreqs(unittest.TestCase): Test that items listed in requirements.text are the same as locals expected """ - pipreqs.init({'': self.project, '--savepath': None, '--print': False, - '--use-local': True, '--force': True, '--proxy':None, '--pypi-server':None, - '--diff': None, '--clean': None, '--mode': None}) + pipreqs.init({ + '': self.project, '--savepath': None, '--print': False, + '--use-local': True, '--force': True, '--proxy': None, + '--pypi-server': None, '--diff': None, '--clean': None, + '--mode': None}) assert os.path.exists(self.requirements_path) == 1 with open(self.requirements_path, "r") as f: data = f.readlines() @@ -145,9 +149,10 @@ class TestPipreqs(unittest.TestCase): Test that we can save requirements.txt correctly to a different path """ - pipreqs.init({'': self.project, '--savepath': self.alt_requirement_path, - '--use-local': None, '--proxy':None, '--pypi-server':None, '--print': False, - '--diff': None, '--clean': None, '--mode': None}) + pipreqs.init({ + '': self.project, '--savepath': self.alt_requirement_path, + '--use-local': None, '--proxy': None, '--pypi-server': None, + '--print': False, '--diff': None, '--clean': None, '--mode': None}) assert os.path.exists(self.alt_requirement_path) == 1 with open(self.alt_requirement_path, "r") as f: data = f.read().lower() @@ -163,9 +168,11 @@ class TestPipreqs(unittest.TestCase): """ with open(self.requirements_path, "w") as f: f.write("should_not_be_overwritten") - pipreqs.init({'': self.project, '--savepath': None, '--use-local': None, - '--force': None, '--proxy':None, '--pypi-server':None, '--print': False, - '--diff': None, '--clean': None, '--mode': None}) + pipreqs.init({ + '': self.project, '--savepath': None, '--use-local': None, + '--force': None, '--proxy': None, '--pypi-server': None, + '--print': False, '--diff': None, '--clean': None, + '--mode': None}) assert os.path.exists(self.requirements_path) == 1 with open(self.requirements_path, "r") as f: data = f.read().lower() @@ -203,13 +210,15 @@ class TestPipreqs(unittest.TestCase): Test --ignore parameter """ pipreqs.init( - {'': self.project_with_ignore_directory, '--savepath': None, - '--print': False, '--use-local': None, '--force': True, - '--proxy':None, '--pypi-server':None, - '--ignore':'.ignored_dir,.ignore_second', - '--diff': None, - '--clean': None, - '--mode': None + { + '': self.project_with_ignore_directory, + '--savepath': None, '--print': False, + '--use-local': None, '--force': True, + '--proxy': None, '--pypi-server': None, + '--ignore': '.ignored_dir,.ignore_second', + '--diff': None, + '--clean': None, + '--mode': None } ) with open( @@ -225,7 +234,7 @@ class TestPipreqs(unittest.TestCase): Test --mode=no-pin """ pipreqs.init( - {'': self.project_with_ignore_directory, '--savepath': None, + {'': self.project_with_ignore_directory, '--savepath': None, '--print': False, '--use-local': None, '--force': True, '--proxy': None, '--pypi-server': None, '--diff': None, @@ -233,7 +242,9 @@ class TestPipreqs(unittest.TestCase): '--mode': 'no-pin' } ) - with open(os.path.join(self.project_with_ignore_directory, "requirements.txt"), "r") as f: + with open(os.path.join( + self.project_with_ignore_directory, "requirements.txt"), "r" + ) as f: data = f.read().lower() for item in ['beautifulsoup4', 'boto']: self.assertTrue(item.lower() in data) @@ -243,16 +254,20 @@ class TestPipreqs(unittest.TestCase): Test --mode=gt """ pipreqs.init( - {'': self.project_with_ignore_directory, '--savepath': None, '--print': False, - '--use-local': None, '--force': True, - '--proxy': None, - '--pypi-server': None, - '--diff': None, - '--clean': None, - '--mode': 'gt' + { + '': self.project_with_ignore_directory, + '--savepath': None, '--print': False, + '--use-local': None, '--force': True, + '--proxy': None, + '--pypi-server': None, + '--diff': None, + '--clean': None, + '--mode': 'gt' } ) - with open(os.path.join(self.project_with_ignore_directory, "requirements.txt"), "r") as f: + with open(os.path.join( + self.project_with_ignore_directory, "requirements.txt"), "r" + ) as f: data = f.readlines() for item in data: symbol = '>=' @@ -264,16 +279,20 @@ class TestPipreqs(unittest.TestCase): Test --mode=compat """ pipreqs.init( - {'': self.project_with_ignore_directory, '--savepath': None, '--print': False, - '--use-local': None, '--force': True, - '--proxy': None, - '--pypi-server': None, - '--diff': None, - '--clean': None, - '--mode': 'compat' + { + '': self.project_with_ignore_directory, + '--savepath': None, '--print': False, + '--use-local': None, '--force': True, + '--proxy': None, + '--pypi-server': None, + '--diff': None, + '--clean': None, + '--mode': 'compat' } ) - with open(os.path.join(self.project_with_ignore_directory, "requirements.txt"), "r") as f: + with open(os.path.join( + self.project_with_ignore_directory, "requirements.txt"), "r" + ) as f: data = f.readlines() for item in data: symbol = '~=' @@ -285,17 +304,19 @@ class TestPipreqs(unittest.TestCase): Test --clean parameter """ pipreqs.init( - {'': self.project, '--savepath': None, '--print': False, - '--use-local': None, '--force': True, '--proxy': None, - '--pypi-server': None, '--diff': None, '--clean': None, - '--mode': None} + { + '': self.project, '--savepath': None, '--print': False, + '--use-local': None, '--force': True, '--proxy': None, + '--pypi-server': None, '--diff': None, '--clean': None, + '--mode': None} ) assert os.path.exists(self.requirements_path) == 1 pipreqs.init( - {'': self.project, '--savepath': None, '--print': False, - '--use-local': None, '--force': None, '--proxy': None, - '--pypi-server': None, '--diff': None, - '--clean': self.requirements_path, '--mode': 'non-pin'} + { + '': self.project, '--savepath': None, '--print': False, + '--use-local': None, '--force': None, '--proxy': None, + '--pypi-server': None, '--diff': None, + '--clean': self.requirements_path, '--mode': 'non-pin'} ) with open(self.requirements_path, "r") as f: data = f.read().lower() @@ -308,18 +329,21 @@ class TestPipreqs(unittest.TestCase): """ cleaned_module = 'sqlalchemy' pipreqs.init( - {'': self.project, '--savepath': None, '--print': False, - '--use-local': None, '--force': True, '--proxy': None, - '--pypi-server': None, '--diff': None, '--clean': None, - '--mode': None} + { + '': self.project, '--savepath': None, '--print': False, + '--use-local': None, '--force': True, '--proxy': None, + '--pypi-server': None, '--diff': None, '--clean': None, + '--mode': None} ) assert os.path.exists(self.requirements_path) == 1 - modules_clean = [m for m in self.modules if m != cleaned_module] + modules_clean = [ # noqa:F841 + m for m in self.modules if m != cleaned_module] pipreqs.init( - {'': self.project_clean, '--savepath': None, - '--print': False, '--use-local': None, '--force': None, - '--proxy': None, '--pypi-server': None, '--diff': None, - '--clean': self.requirements_path, '--mode': 'non-pin'} + { + '': self.project_clean, '--savepath': None, + '--print': False, '--use-local': None, '--force': None, + '--proxy': None, '--pypi-server': None, '--diff': None, + '--clean': self.requirements_path, '--mode': 'non-pin'} ) with open(self.requirements_path, "r") as f: data = f.read().lower()