From d4e1e9144d7d24d8406d3b1a8f49dfe7825816e1 Mon Sep 17 00:00:00 2001 From: Vadim Kravcenko Date: Fri, 8 May 2015 17:36:41 +0200 Subject: [PATCH] style: PEP8 cleanup --- pipreqs/pipreqs.py | 31 ++++++++++++++++--------------- tests/test_pipreqs.py | 42 ++++++++++++++++++++++++++---------------- 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/pipreqs/pipreqs.py b/pipreqs/pipreqs.py index 2467ec0..ccbd58b 100755 --- a/pipreqs/pipreqs.py +++ b/pipreqs/pipreqs.py @@ -100,10 +100,10 @@ def get_locally_installed_packages(): package_import = f.read().strip().split("\n") for item in package_import: if item not in ["tests", "_tests"]: - packages[item] = { - 'version': package[1].replace(".dist", ""), - 'name': package[0] - } + packages[item] = { + 'version': package[1].replace(".dist", ""), + 'name': package[0] + } return packages @@ -115,18 +115,19 @@ def get_import_local(imports): result.append(local[item.lower()]) return result + def get_pkg_names_from_import_names(pkgs): - result = [] - with open(os.path.join(os.path.dirname(__file__), "mapping"), "r") as f: - data = [x.strip().split(":") for x in f.readlines()] - for pkg in pkgs: - toappend = pkg - for item in data: - if item[0] == pkg: - toappend = item[1] - break - result.append(toappend) - return result + result = [] + with open(os.path.join(os.path.dirname(__file__), "mapping"), "r") as f: + data = [x.strip().split(":") for x in f.readlines()] + for pkg in pkgs: + toappend = pkg + for item in data: + if item[0] == pkg: + toappend = item[1] + break + result.append(toappend) + return result def init(args): diff --git a/tests/test_pipreqs.py b/tests/test_pipreqs.py index c4db9cb..6e2f3d4 100755 --- a/tests/test_pipreqs.py +++ b/tests/test_pipreqs.py @@ -8,24 +8,29 @@ test_pipreqs Tests for `pipreqs` module. """ -import unittest, os +import unittest +import os from pipreqs import pipreqs class TestPipreqs(unittest.TestCase): + def setUp(self): - self.modules = ['flask', 'requests', 'sqlalchemy', 'docopt', 'ujson', 'nonexistendmodule', 'bs4'] + self.modules = ['flask', 'requests', 'sqlalchemy', + 'docopt', 'ujson', 'nonexistendmodule', 'bs4'] self.modules2 = ['beautifulsoup4'] self.project = os.path.join(os.path.dirname(__file__), "_data") self.requirements_path = os.path.join(self.project, "requirements.txt") - self.alt_requirement_path = os.path.join(self.project, "requirements2.txt") + self.alt_requirement_path = os.path.join( + self.project, "requirements2.txt") def test_get_all_imports(self): imports = pipreqs.get_all_imports(self.project) self.assertEqual(len(imports), 7, "Incorrect Imports array length") for item in imports: - self.assertTrue(item.lower() in self.modules, "Import is missing: " + item) + self.assertTrue( + item.lower() in self.modules, "Import is missing: " + item) self.assertFalse("time" in imports) self.assertFalse("logging" in imports) self.assertFalse("curses" in imports) @@ -38,17 +43,20 @@ class TestPipreqs(unittest.TestCase): with_info = pipreqs.get_imports_info(imports) # Should contain only 5 Elements without the "nonexistendmodule" print (with_info) - self.assertEqual(len(with_info), 5, "Length of imports array with info is wrong") + self.assertEqual( + len(with_info), 5, "Length of imports array with info is wrong") for item in with_info: - self.assertTrue(item['name'].lower() in self.modules, "Import item appears to be missing " + item['name']) - + self.assertTrue(item['name'].lower( + ) in self.modules, "Import item appears to be missing " + item['name']) + def test_get_use_local_only(self): - # should find only docopt and requests - imports_with_info = pipreqs.get_import_local(self.modules) - self.assertEqual(len(imports_with_info), 2) + # should find only docopt and requests + imports_with_info = pipreqs.get_import_local(self.modules) + self.assertEqual(len(imports_with_info), 2) def test_init(self): - pipreqs.init({'': self.project, '--savepath': None,'--use-local':None}) + pipreqs.init( + {'': self.project, '--savepath': None, '--use-local': None}) assert os.path.exists(self.requirements_path) == 1 with open(self.requirements_path, "r") as f: data = f.read().lower() @@ -56,21 +64,23 @@ class TestPipreqs(unittest.TestCase): self.assertTrue(item.lower() in data) def test_init_local_only(self): - pipreqs.init({'': self.project, '--savepath': None,'--use-local':True}) + pipreqs.init( + {'': self.project, '--savepath': None, '--use-local': True}) assert os.path.exists(self.requirements_path) == 1 with open(self.requirements_path, "r") as f: - self.assertEqual(len(f.readlines()), 2, 'Only two local packages should be found') + self.assertEqual( + len(f.readlines()), 2, 'Only two local packages should be found') def test_init_savepath(self): - pipreqs.init({'': self.project, '--savepath': self.alt_requirement_path,'--use-local':None}) + pipreqs.init({'': self.project, '--savepath': + self.alt_requirement_path, '--use-local': None}) assert os.path.exists(self.alt_requirement_path) == 1 with open(self.alt_requirement_path, "r") as f: data = f.read().lower() for item in self.modules[:-2]: self.assertTrue(item.lower() in data) for item in self.modules2: - self.assertTrue(item.lower() in data) - + self.assertTrue(item.lower() in data) def tearDown(self): try: