Merge pull request #2526 from nexB/2524-pypi

Improve pypi and windows processing #2524
Fix support for Windows PE DLLs and exe that was disabled.

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

.gitignore

@@ -8,7 +8,7 @@
 /thirdparty
 
 # virtualenv and other misc bits
-*.egg-info
+/src/*.egg-info
 /dist
 /build
 /bin

requirements.txt

@@ -10,7 +10,7 @@ click==6.7
 colorama==0.4.4
 commoncode==21.1.21
 debian-inspector==0.9.10
-dparse2==0.5.0.4
+dparse==0.5.1
 extractcode==21.2.24
 extractcode-7z==16.5.210223
 extractcode-libarchive==3.5.1.210223
@@ -40,7 +40,7 @@ patch==1.16
 pdfminer.six==20181108
 pefile==2019.4.18
 pip==20.3.3
-pkginfo==1.5.0.1
+pkginfo==1.7.0
 pluggy==0.12.0
 plugincode==21.1.21
 ply==3.9
@@ -72,4 +72,4 @@ wcwidth==0.1.7
 webencodings==0.5
 wheel==0.36.2
 xmltodict==0.11.0
-zipp==0.5.1
+zipp==3.4.1

setup-mini.cfg

@@ -61,12 +61,13 @@ install_requires =
     colorama >= 0.3.9
     commoncode >= 21.1.21
     debian-inspector >= 0.9.10
-    dparse2
+    dparse >= 0.5.1
     fasteners
     fingerprints >= 0.6.0
     ftfy <  5.0.0
     gemfileparser >= 0.7.0
     html5lib
+    importlib_metadata; python_version < "3.9"
     intbitset >= 2.3.0,  < 3.0
     jaraco.functools
     javaproperties >= 0.5
@@ -77,6 +78,7 @@ install_requires =
     MarkupSafe >= 0.23
     nltk >= 3.2, !=3.6, < 4.0
     packageurl_python >= 0.7.0
+    packaging
     pdfminer.six >= 20170720
     pefile >= 2018.8.8
     pkginfo >= 1.5.0.1
@@ -95,6 +97,7 @@ install_requires =
     typing >=3.6, < 3.7; python_version < "3.7"
     urlpy
     xmltodict >= 0.11.0
+    zipp >= 3.0.0; python_version < "3.9"
     typecode >= 21.2.24
 
 

setup.cfg

@@ -61,12 +61,13 @@ install_requires =
     colorama >= 0.3.9
     commoncode >= 21.1.21
     debian-inspector >= 0.9.10
-    dparse2
+    dparse >= 0.5.1
     fasteners
     fingerprints >= 0.6.0
     ftfy <  5.0.0
     gemfileparser >= 0.7.0
     html5lib
+    importlib_metadata; python_version < "3.9"
     intbitset >= 2.3.0,  < 3.0
     jaraco.functools
     javaproperties >= 0.5
@@ -77,6 +78,7 @@ install_requires =
     MarkupSafe >= 0.23
     nltk >= 3.2, !=3.6, < 4.0
     packageurl_python >= 0.7.0
+    packaging
     pdfminer.six >= 20170720
     pefile >= 2018.8.8
     pkginfo >= 1.5.0.1
@@ -95,6 +97,7 @@ install_requires =
     typing >=3.6, < 3.7; python_version < "3.7"
     urlpy
     xmltodict >= 0.11.0
+    zipp >= 3.0.0; python_version < "3.9"
     extractcode[full] >= 21.2.24
     typecode[full] >= 21.2.24
 

src/packagedcode/__init__.py

@@ -30,7 +30,6 @@
 from packagedcode import rubygems
 from packagedcode import win_pe
 
-
 # Note: the order matters: from the most to the least specific
 # Package classes MUST be added to this list to be active
 PACKAGE_TYPES = [
@@ -89,6 +88,7 @@
 if len(PACKAGES_BY_TYPE) != len(PACKAGE_TYPES):
     seen_types = {}
     for pt in PACKAGE_TYPES:
+        assert pt.default_type
         seen = seen_types.get(pt.default_type)
         if seen:
             msg = ('Invalid duplicated packagedcode.Package types: '

src/packagedcode/models.py

@@ -603,13 +603,12 @@ def to_dict(self, _detailed=False, **kwargs):
 
 def compute_normalized_license(declared_license):
     """
-    Return a normalized license_expression string using the declared_license
-    field. Return 'unknown' if there is a declared license but it cannot be
-    detected (including on errors) and return None if there is no declared
-    license.
+    Return a normalized license_expression string from the ``declared_license``.
+    Return 'unknown' if there is a declared license but it cannot be detected
+    (including on errors) and return None if there is no declared license.
     """
 
-    if not declared_license or not declared_license.strip():
+    if not declared_license:
         return
 
     from packagedcode import licensing