Merge pull request #110 from bennati/fix-duplicated-package-versions

Prevent duplicated package versions

Author: pombredanne

src/python_inspector/resolution.py

@@ -367,20 +367,20 @@ def get_versions_for_package_from_repo(
                 get_python_version_from_env_tag(python_version=self.environment.python_version)
             )
             wheels = list(package.get_supported_wheels(environment=self.environment))
+            valid_wheel_present = False
+            pypi_valid_python_version = False
             if wheels:
-                valid_wheel_present = False
                 for wheel in wheels:
                     if utils_pypi.valid_python_version(
                         python_requires=wheel.python_requires, python_version=python_version
                     ):
                         valid_wheel_present = True
-                if valid_wheel_present:
-                    versions.append(version)
             if package.sdist:
-                if utils_pypi.valid_python_version(
+                pypi_valid_python_version = utils_pypi.valid_python_version(
                     python_requires=package.sdist.python_requires, python_version=python_version
-                ):
-                    versions.append(version)
+                )
+            if valid_wheel_present or pypi_valid_python_version:
+                versions.append(version)
         return versions
 
     def get_versions_for_package_from_pypi_json_api(self, name: str) -> List[Version]:

tests/data/azure-devops.req-310-expected.json

@@ -120,12 +120,12 @@ def test_get_resolved_dependencies_with_tilde_requirement_using_json_api():
     assert plist == [
         "pkg:pypi/click@8.1.3",
         "pkg:pypi/flask@2.1.3",
-        "pkg:pypi/importlib-metadata@5.0.0",
+        "pkg:pypi/importlib-metadata@6.0.0",
         "pkg:pypi/itsdangerous@2.1.2",
         "pkg:pypi/jinja2@3.1.2",
         "pkg:pypi/markupsafe@2.1.1",
         "pkg:pypi/werkzeug@2.2.2",
-        "pkg:pypi/zipp@3.10.0",
+        "pkg:pypi/zipp@3.11.0",
     ]
 
 
@@ -146,11 +146,11 @@ def test_without_supported_wheels():
     assert plist == [
         "pkg:pypi/autobahn@22.3.2",
         "pkg:pypi/cffi@1.15.1",
-        "pkg:pypi/cryptography@38.0.3",
+        "pkg:pypi/cryptography@39.0.0",
         "pkg:pypi/hyperlink@21.0.0",
         "pkg:pypi/idna@3.4",
         "pkg:pypi/pycparser@2.21",
-        "pkg:pypi/setuptools@65.5.1",
+        "pkg:pypi/setuptools@65.7.0",
         "pkg:pypi/txaio@22.2.1",
     ]