Fix requirements & update database

Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com>

pigar/core.py

@@ -22,18 +22,15 @@
     Color, lines_diff, print_table, parse_requirements, PraseRequirementError,
     trim_prefix, trim_suffix
 )
-from .parser import parse_imports, parse_installed_packages
+from .parser import parse_imports, parse_installed_packages, _special_package_import_names
 from .pypi import PKGS_URL, Downloader, Updater
 
 from requests.exceptions import HTTPError
 
-# FIXME: dirty workaround..
-_special_packages = {
-    "dogpile.cache": "dogpile.cache",
-    "dogpile.core": "dogpile.core",
-    "ruamel.yaml": "ruamel.yaml",
-    "ruamel.ordereddict": "ruamel.ordereddict",
-}
+_special_import_names = {}
+for pkg_name, import_names in _special_package_import_names.items():
+    for import_name in import_names:
+        _special_import_names[import_name] = pkg_name
 
 
 class RequirementsGenerator(object):
@@ -342,8 +339,8 @@ def parse_packages(package_root, ignores=None, installed_pkgs=None):
             names.append('flask')
             names.append('flask_' + name.split('.')[2])
         # Special cases..
-        elif special_name in _special_packages:
-            names.append(_special_packages[special_name])
+        elif special_name in _special_import_names:
+            names.append(special_name)
         # Other.
         elif '.' in name:
             names.append(name.split('.')[0])

pigar/db.py

@@ -3,6 +3,7 @@
 from __future__ import print_function, division, absolute_import
 
 import os
+import re
 import sqlite3
 import contextlib
 try:  # py2
@@ -12,14 +13,6 @@
 
 from .helpers import Dict, retry
 
-# TODO(damnever): insert into db by default.
-# (import_name, package_name)
-_F_PACKAGES = {
-    'yaml': 'PyYAML',
-    'dogpile.cache': 'dogpile.cache',
-    'dogpile.core': 'dogpile.core',
-}
-
 
 class Database(object):
     """Database store (top_level_name, package_name) piars.

pigar/parser.py

@@ -285,6 +285,15 @@ def parse_installed_packages():
     return mapping
 
 
+# FIXME: dirty workaround..
+# Special distributions top level import name: Distribution name -> import name.
+_special_package_import_names = {
+    "dogpile.cache": ("dogpile.cache", ),
+    "dogpile.core": ("dogpile.core", ),
+    "ruamel.yaml": ("ruamel.yaml", ),
+}
+
+
 def _search_path(path):
     mapping = dict()
 
@@ -304,6 +313,10 @@ def _search_path(path):
             with open(top_level, 'r') as f:
                 for line in f:
                     mapping[line.strip()] = (pkg_name, version)
+            for import_name in _special_package_import_names.get(
+                pkg_name, set()
+            ):
+                mapping[import_name] = (pkg_name, version)
 
         # Install from local and available in GitHub.
         elif fnmatch.fnmatch(file, '*-link'):

setup.py

@@ -34,7 +34,7 @@
     change_logs = f.read()
 
 install_requires = [
-    'colorama>=0.3.9', 'requests>=2.20.0', 'nbformat>=4.4.0',
+    'colorama>=0.3.9', 'requests>=2.20.0', 'nbformat>=4.4.0', 'packaging>=20.9'
     'futures;python_version<"3.2"'
 ]
 
@@ -70,7 +70,8 @@
     ],
     keywords='requirements.txt,automation,tool,module-search',
     packages=find_packages(
-        exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
+        exclude=["*.tests", "*.tests.*", "tests.*", "tests"]
+    ),
     install_requires=install_requires,
     include_package_data=True,
     entry_points={'console_scripts': [