Merge pull request #96 from nexB/single_binary

TG1999 · web-flow · commit 27fe7109ec11 · 2022-11-04T18:18:25.000+05:30
Do not return duplicates binaries #93
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,7 @@ v0.9.2
 ------
 
 - Make os and python version as mandatory input parameters.
+- Do not return duplicates binaries.
 
 
 v0.9.1
diff --git a/src/python_inspector/package_data.py b/src/python_inspector/package_data.py
@@ -67,16 +67,17 @@ def get_pypi_data_from_purl(
     # if prefer_source is True then only source distribution is used
     # in case of no source distribution available then wheel is used
     if not valid_distribution_urls or not prefer_source:
-        valid_distribution_urls.extend(
-            list(
-                get_wheel_download_urls(
-                    purl=purl,
-                    repos=repos,
-                    environment=environment,
-                    python_version=python_version,
-                )
+        wheel_urls = list(
+            get_wheel_download_urls(
+                purl=purl,
+                repos=repos,
+                environment=environment,
+                python_version=python_version,
             )
         )
+        wheel_url = choose_single_wheel(wheel_urls)
+        if wheel_url:
+            valid_distribution_urls.append(wheel_url)
 
     urls = response.get("urls") or []
     for url in urls:
@@ -110,6 +111,15 @@ def get_pypi_data_from_purl(
         )
 
 
+def choose_single_wheel(wheel_urls):
+    """
+    Sort wheel urls descendingly and return the first one
+    """
+    wheel_urls.sort(reverse=True)
+    if wheel_urls:
+        return wheel_urls[0]
+
+
 def get_pypi_bugtracker_url(project_urls):
     bug_tracking_url = project_urls.get("Tracker")
     if not (bug_tracking_url):
diff --git a/src/python_inspector/resolve_cli.py b/src/python_inspector/resolve_cli.py
@@ -20,7 +20,7 @@
 
 TRACE = False
 
-__version__ = "0.9.1"
+__version__ = "0.9.2"
 
 DEFAULT_PYTHON_VERSION = "38"
 PYPI_SIMPLE_URL = "https://pypi.org/simple"
diff --git a/tests/data/azure-devops.req-310-expected.json b/tests/data/azure-devops.req-310-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/azure-devops.req.txt",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/azure-devops.req-38-expected.json b/tests/data/azure-devops.req-38-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/azure-devops.req.txt",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/default-url-expected.json b/tests/data/default-url-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--specifier zipp==3.8.0",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/environment-marker-test-requirements.txt-expected.json b/tests/data/environment-marker-test-requirements.txt-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/environment-marker-test-requirements.txt",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/frozen-requirements.txt-expected.json b/tests/data/frozen-requirements.txt-expected.json
diff --git a/tests/data/insecure-setup-2/setup.py-expected.json b/tests/data/insecure-setup-2/setup.py-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--index-url https://pypi.org/simple",
       "--python-version 27",
diff --git a/tests/data/insecure-setup/setup.py-expected.json b/tests/data/insecure-setup/setup.py-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--index-url https://pypi.org/simple",
       "--python-version 27",
diff --git a/tests/data/pdt-requirements.txt-expected.json b/tests/data/pdt-requirements.txt-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/pdt-requirements.txt",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/pinned-pdt-requirements.txt-expected.json b/tests/data/pinned-pdt-requirements.txt-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/pinned-pdt-requirements.txt",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/pinned-requirements.txt-expected.json b/tests/data/pinned-requirements.txt-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/pinned-requirements.txt",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/prefer-source-expected.json b/tests/data/prefer-source-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--specifier zipp==3.8.0",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/setup/no-direct-dependencies-setup.py-expected.json b/tests/data/setup/no-direct-dependencies-setup.py-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--index-url https://pypi.org/simple",
       "--python-version 27",
diff --git a/tests/data/setup/simple-setup.py-expected.json b/tests/data/setup/simple-setup.py-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--index-url https://pypi.org/simple",
       "--python-version 27",
diff --git a/tests/data/setup/spdx-setup.py-expected.json b/tests/data/setup/spdx-setup.py-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--index-url https://pypi.org/simple",
       "--python-version 27",
diff --git a/tests/data/single-url-except-simple-expected.json b/tests/data/single-url-except-simple-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--specifier flask",
       "--index-url https://thirdparty.aboutcode.org/pypi/simple/",
diff --git a/tests/data/single-url-expected.json b/tests/data/single-url-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--specifier zipp==3.8.0",
       "--index-url https://pypi.org/simple",
diff --git a/tests/data/test-api-with-requirement-file.json b/tests/data/test-api-with-requirement-file.json
diff --git a/tests/data/tilde_req-expected.json b/tests/data/tilde_req-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.1",
+    "tool_version": "0.9.2",
     "options": [
       "--specifier zipp~=3.8.0",
       "--index-url https://pypi.org/simple",
diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -373,7 +373,7 @@ def test_passing_of_json_pdt_and_json_flags():
 def test_version_option():
     options = ["--version"]
     result = run_cli(options=options)
-    assert "0.9.1" in result.output
+    assert "0.9.2" in result.output
 
 
 def test_passing_of_netrc_file_that_does_not_exist():
