From 638e2f1046199181af584ce6c481d979818873e5 Mon Sep 17 00:00:00 2001 From: Nick Gustafson Date: Thu, 8 Feb 2018 10:10:54 -0800 Subject: [PATCH 1/3] fix oauth2client bug in mapping --- pipreqs/mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipreqs/mapping b/pipreqs/mapping index 3608616..b4dfed3 100644 --- a/pipreqs/mapping +++ b/pipreqs/mapping @@ -800,7 +800,7 @@ nester:abofly nester:bssm_pythonSig novaclient:python_novaclient oauth2_provider:alauda_django_oauth -oauth2client:google_api_python_client +oauth2client:oauth2client odf:odfpy ometa:Parsley openid:python_openid From 712879a7becb608d28505355fce5a07769ecdb92 Mon Sep 17 00:00:00 2001 From: Nick Gustafson Date: Thu, 8 Feb 2018 10:11:16 -0800 Subject: [PATCH 2/3] fix sorting bug in get_pkg_names for consistency with pip freeze --- pipreqs/pipreqs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipreqs/pipreqs.py b/pipreqs/pipreqs.py index 0186832..4e7b39f 100755 --- a/pipreqs/pipreqs.py +++ b/pipreqs/pipreqs.py @@ -267,7 +267,7 @@ def get_pkg_names(pkgs): # simply use the package name. result.add(data.get(pkg, pkg)) # Return a sorted list for backward compatibility. - return sorted(result) + return sorted(result, key=lambda s: s.lower()) def get_name_without_alias(name): From 457174091940cbb2dab25941dfb9efeab0e8feaa Mon Sep 17 00:00:00 2001 From: Nick Gustafson Date: Thu, 8 Feb 2018 11:05:47 -0800 Subject: [PATCH 3/3] add test for get_pkg_names change --- tests/test_pipreqs.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/test_pipreqs.py b/tests/test_pipreqs.py index 2b855fa..a020fab 100755 --- a/tests/test_pipreqs.py +++ b/tests/test_pipreqs.py @@ -69,6 +69,12 @@ class TestPipreqs(unittest.TestCase): item['name'].lower() in self.modules, "Import item appears to be missing " + item['name']) + def test_get_pkg_names(self): + pkgs = ['jury', 'Japan', 'camel', 'Caroline'] + actual_output = pipreqs.get_pkg_names(pkgs) + expected_output = ['camel', 'Caroline', 'Japan', 'jury'] + self.assertEqual(actual_output, expected_output) + def test_get_use_local_only(self): """ Test without checking PyPI, check to see if names of local imports matches what we expect