use valid dependency operator

Signed-off-by: rpotter12 <rohitpotter12@gmail.com>

Author: rpotter12

src/packagedcode/pypi.py

@@ -209,9 +209,9 @@ def parse_with_dparse(location):
         return
     file_name = fileutils.file_name(location)
 
-    file_name = get_dependency_type(file_name)
+    dependency_type = get_dependency_type(file_name)
 
-    if file_name not in (filetypes.requirements_txt,
+    if dependency_type not in (filetypes.requirements_txt,
                          filetypes.conda_yml,
                          filetypes.tox_ini,
                          filetypes.pipfile,
@@ -223,31 +223,43 @@ def parse_with_dparse(location):
         mode = 'r'
     with open(location, mode) as f:
         content = f.read()
-        df = dparse.parse(content, file_type=file_name)
-        df_dependencies = df.dependencies
-        if not df_dependencies:
-            return
-        package_dependencies = []
-        for df_dependency in df_dependencies:
-            specs = df_dependency.specs
-            is_resolved = False
-            requirement = None
-            if specs:
-                requirement = str(specs)
-                if '==' in requirement:
-                    is_resolved = True
-            package_dependencies.append(
-                models.DependentPackage(
-                    purl=PackageURL(
-                        type='pypi', name=df_dependency.name).to_string(),
-                    scope='dependencies',
-                    is_runtime=True,
-                    is_optional=False,
-                    is_resolved=is_resolved,
-                    requirement=requirement
-                )
+        
+    df = dparse.parse(content, file_type=dependency_type)
+    df_dependencies = df.dependencies
+
+    if not df_dependencies:
+        return
+
+    package_dependencies = []
+    for df_dependency in df_dependencies:
+        specs = list(df_dependency.specs._specs)
+        is_resolved = False
+        requirement = None
+        purl = PackageURL(
+            type='pypi',
+            name=df_dependency.name
+        ).to_string()
+        if specs:
+            requirement = specs[0]
+            if specs[0].operator == '==':
+                is_resolved = True
+                purl = PackageURL(
+                    type='pypi',
+                    name=df_dependency.name,
+                    version=specs[0].version
+                ).to_string()
+        package_dependencies.append(
+            models.DependentPackage(
+                purl=purl,
+                scope='dependencies',
+                is_runtime=True,
+                is_optional=False,
+                is_resolved=is_resolved,
+                requirement=requirement
             )
-        return package_dependencies
+        )
+
+    return package_dependencies
 
 
 def parse_requirements_txt(location):

tests/packagedcode/data/pypi/requirements_txt/sample2/output.expected.json

@@ -27,23 +27,23 @@
   "root_path": null,
   "dependencies": [
     {
-      "purl": "pkg:pypi/aiohttp",
+      "purl": "pkg:pypi/aiohttp@3.6.2",
       "requirement": "==3.6.2",
       "scope": "dependencies",
       "is_runtime": true,
       "is_optional": false,
       "is_resolved": true
     },
     {
-      "purl": "pkg:pypi/async-timeout",
+      "purl": "pkg:pypi/async-timeout@3.0.1",
       "requirement": "==3.0.1",
       "scope": "dependencies",
       "is_runtime": true,
       "is_optional": false,
       "is_resolved": true
     },
     {
-      "purl": "pkg:pypi/attrs",
+      "purl": "pkg:pypi/attrs@19.3.0",
       "requirement": "==19.3.0",
       "scope": "dependencies",
       "is_runtime": true,

tests/packagedcode/data/pypi/requirements_txt/sample3/output.expected.json

@@ -35,7 +35,7 @@
       "is_resolved": false
     },
     {
-      "purl": "pkg:pypi/pygments",
+      "purl": "pkg:pypi/pygments@2.2.0",
       "requirement": "==2.2.0",
       "scope": "dependencies",
       "is_runtime": true,

tests/packagedcode/data/pypi/requirements_txt/sample5/output.expected.json

@@ -35,7 +35,7 @@
       "is_resolved": false
     },
     {
-      "purl": "pkg:pypi/pygments",
+      "purl": "pkg:pypi/pygments@2.2.0",
       "requirement": "==2.2.0",
       "scope": "dependencies",
       "is_runtime": true,

tests/packagedcode/data/pypi/requirements_txt/sample6/output.expected.json

@@ -35,7 +35,7 @@
       "is_resolved": false
     },
     {
-      "purl": "pkg:pypi/pygments",
+      "purl": "pkg:pypi/pygments@2.2.0",
       "requirement": "==2.2.0",
       "scope": "dependencies",
       "is_runtime": true,

tests/packagedcode/data/pypi/requirements_txt/sample7/output.expected.json

@@ -27,23 +27,23 @@
   "root_path": null,
   "dependencies": [
     {
-      "purl": "pkg:pypi/aiohttp",
+      "purl": "pkg:pypi/aiohttp@3.6.2",
       "requirement": "==3.6.2",
       "scope": "dependencies",
       "is_runtime": true,
       "is_optional": false,
       "is_resolved": true
     },
     {
-      "purl": "pkg:pypi/async-timeout",
+      "purl": "pkg:pypi/async-timeout@3.0.1",
       "requirement": "==3.0.1",
       "scope": "dependencies",
       "is_runtime": true,
       "is_optional": false,
       "is_resolved": true
     },
     {
-      "purl": "pkg:pypi/attrs",
+      "purl": "pkg:pypi/attrs@19.3.0",
       "requirement": "==19.3.0",
       "scope": "dependencies",
       "is_runtime": true,

tests/packagedcode/test_pypi.py

@@ -314,8 +314,8 @@ def test_requirements_txt_sample7(self):
     def test_parse_with_dparse(self):
         test_file = self.get_test_loc('pypi/dparse/requirements.txt')
         dependencies = pypi.parse_with_dparse(test_file)
-        assert [DependentPackage(purl='pkg:pypi/lxml', requirement='==3.4.4', scope='dependencies', is_resolved=True),
-                DependentPackage(purl='pkg:pypi/requests', requirement='==2.7.0', scope='dependencies', is_resolved=True)] == dependencies
+        assert [DependentPackage(purl='pkg:pypi/lxml@3.4.4', requirement='==3.4.4', scope='dependencies', is_resolved=True),
+                DependentPackage(purl='pkg:pypi/requests@2.7.0', requirement='==2.7.0', scope='dependencies', is_resolved=True)] == dependencies
 
 
 FILENAME_LIST = [