Replaced Packaging module with Packvers in different files.

Signed-off-by: swastik <swastkk@gmail.com>

Author: TG1999

CHANGELOG.rst

@@ -6,10 +6,6 @@ v0.9.3
 ------
 
 - Add support for recursive requirements.
-- Add python 3.11 as a valid python version in choices.
-- Operating system and python version are now required fields in CLI.
-- Add dot versions (3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 2.7) with 
-  current python version choices for CLI (36, 37, 38, 39, 310, 311, 27).
 
 
 v0.9.2

requirements.txt

@@ -5,13 +5,14 @@ charset-normalizer==2.1.0
 click==8.1.3
 colorama==0.4.5
 commoncode==30.2.0
-dparse2==0.6.1
+dparse2==0.7.0
 idna==3.3
 importlib-metadata==4.12.0
 intbitset==3.0.1
 packageurl-python==0.10.0
 packaging==21.3
-pip-requirements-parser==31.2.0
+packvers==21.5
+pip-requirements-parser==32.0.1
 pkginfo2==30.0.0
 pyparsing==3.0.9
 PyYAML==6.0

setup.cfg

@@ -58,18 +58,19 @@ install_requires =
     click > 7.0
     colorama >= 0.3.9
     commoncode >= 30.0.0
-    dparse2 >= 0.6.1
+    dparse2 >= 0.7.0
     importlib_metadata >= 4.12.0
     packageurl_python >= 0.9.0
     pkginfo2 >= 30.0.0
-    pip-requirements-parser >= 31.2.0
+    pip-requirements-parser >= 32.0.1
     requests >= 2.18.0
     resolvelib >= 0.8.1
     saneyaml >= 0.5.2
     tinynetrc >= 1.3.1
     toml >= 0.10.0
     mock >= 3.0.5
-
+    packaging >= 21.0.0
+    packvers >= 21.5
 [options.packages.find]
 where = src
 

src/_packagedcode/pypi.py

@@ -22,15 +22,14 @@
 import zipfile
 
 import dparse2
-import packaging
+import packvers as packaging
 import pip_requirements_parser
-import pkginfo2
 from commoncode import fileutils
-from packaging.specifiers import SpecifierSet
+from packvers.specifiers import SpecifierSet
 from packageurl import PackageURL
-from packaging import markers
-from packaging.requirements import Requirement
-from packaging.utils import canonicalize_name
+from packvers import markers
+from packvers.requirements import Requirement
+from packvers.utils import canonicalize_name
 
 from _packagedcode import models
 from _packagedcode.utils import build_description

src/python_inspector/api.py

@@ -16,7 +16,7 @@
 from typing import Sequence
 
 from packageurl import PackageURL
-from packaging.requirements import Requirement
+from packvers.requirements import Requirement
 from resolvelib import BaseReporter
 from resolvelib import Resolver
 from tinynetrc import Netrc
@@ -40,8 +40,8 @@
 from python_inspector.resolution import get_requirements_from_python_manifest
 from python_inspector.utils_pypi import PLATFORMS_BY_OS
 from python_inspector.utils_pypi import PYPI_SIMPLE_URL
+from python_inspector.utils_pypi import PYTHON_DOT_VERSIONS_BY_VER
 from python_inspector.utils_pypi import Environment
-from python_inspector.utils_pypi import valid_python_versions
 
 
 class Resolution(NamedTuple):
@@ -103,6 +103,9 @@ def resolve_dependencies(
             f"Must be one of: {', '.join(PLATFORMS_BY_OS.keys())}"
         )
 
+    valid_python_versions = list(PYTHON_DOT_VERSIONS_BY_VER.keys())
+    valid_python_versions.extend([dot_ver for pyver, dot_ver in PYTHON_DOT_VERSIONS_BY_VER.items()])
+
     if not python_version:
         raise Exception(f"No python version provided.")
     if python_version not in valid_python_versions:

src/python_inspector/dependencies.py

@@ -10,7 +10,7 @@
 #
 
 from packageurl import PackageURL
-from packaging.requirements import Requirement
+from packvers.requirements import Requirement
 from pip_requirements_parser import InstallRequirement
 
 from _packagedcode import models

src/python_inspector/resolution.py

@@ -18,12 +18,12 @@
 from typing import Union
 from zipfile import ZipFile
 
-import packaging.utils
+import packvers.utils
 from packageurl import PackageURL
-from packaging.requirements import Requirement
-from packaging.version import LegacyVersion
-from packaging.version import Version
-from packaging.version import parse as parse_version
+from packvers.requirements import Requirement
+from packvers.version import LegacyVersion
+from packvers.version import Version
+from packvers.version import parse as parse_version
 from resolvelib import AbstractProvider
 from resolvelib.structs import DirectedGraph
 
@@ -325,7 +325,7 @@ def __init__(
 
     def identify(self, requirement_or_candidate: Union[Candidate, Requirement]) -> str:
         """Given a requirement, return an identifier for it. Overridden."""
-        name = packaging.utils.canonicalize_name(requirement_or_candidate.name)
+        name = packvers.utils.canonicalize_name(requirement_or_candidate.name)
         if requirement_or_candidate.extras:
             extras_str = ",".join(sorted(requirement_or_candidate.extras))
             return "{}[{}]".format(name, extras_str)
@@ -576,7 +576,7 @@ def _iter_dependencies(self, candidate: Candidate) -> Generator[Requirement, Non
         """
         Yield dependencies for the given candidate.
         """
-        name = packaging.utils.canonicalize_name(candidate.name)
+        name = packvers.utils.canonicalize_name(candidate.name)
         # TODO: handle extras https://github.com/nexB/python-inspector/issues/10
         if candidate.extras:
             r = f"{name}=={candidate.version}"

src/python_inspector/resolve_cli.py

@@ -70,10 +70,9 @@ def print_version(ctx, param, value):
     "-p",
     "--python-version",
     "python_version",
-    type=click.Choice(utils_pypi.valid_python_versions),
+    type=click.Choice(utils_pypi.PYTHON_VERSIONS),
     metavar="PYVER",
     show_default=True,
-    required=True,
     help="Python version to use for dependency resolution.",
 )
 @click.option(
@@ -83,7 +82,6 @@ def print_version(ctx, param, value):
     type=click.Choice(utils_pypi.PLATFORMS_BY_OS),
     metavar="OS",
     show_default=True,
-    required=True,
     help="OS to use for dependency resolution.",
 )
 @click.option(

src/python_inspector/setup_py_live_eval.py

@@ -21,7 +21,7 @@
 import mock
 import setuptools
 from commoncode.command import pushd
-from packaging.requirements import Requirement
+from packvers.requirements import Requirement
 
 
 def minver_error(pkg_name):

src/python_inspector/utils_pip_compatibility_tags.py

@@ -27,12 +27,12 @@
 
 import re
 
-from packaging.tags import compatible_tags
-from packaging.tags import cpython_tags
-from packaging.tags import generic_tags
-from packaging.tags import interpreter_name
-from packaging.tags import interpreter_version
-from packaging.tags import mac_platforms
+from packvers.tags import compatible_tags
+from packvers.tags import cpython_tags
+from packvers.tags import generic_tags
+from packvers.tags import interpreter_name
+from packvers.tags import interpreter_version
+from packvers.tags import mac_platforms
 
 _osx_arch_pat = re.compile(r"(.+)_(\d+)_(\d+)_(.+)")