changes-for-tests

Author: swastkk

etc/scripts/utils_dejacode.py

@@ -15,7 +15,7 @@
 import requests
 import saneyaml
 
-from packaging import version as packaging_version
+from packvers import version as packaging_version
 
 """
 Utility to create and retrieve package and ABOUT file data from DejaCode.

etc/scripts/utils_pip_compatibility_tags.py

@@ -27,7 +27,7 @@
 
 import re
 
-from packaging.tags import (
+from packvers.tags import (
     compatible_tags,
     cpython_tags,
     generic_tags,

etc/scripts/utils_thirdparty.py

@@ -28,8 +28,8 @@
 from commoncode import fileutils
 from commoncode.hash import multi_checksums
 from commoncode.text import python_safe_name
-from packaging import tags as packaging_tags
-from packaging import version as packaging_version
+from packvers import tags as packaging_tags
+from packvers import version as packaging_version
 
 import utils_pip_compatibility_tags
 

requirements.txt

@@ -10,9 +10,8 @@ idna==3.3
 importlib-metadata==4.12.0
 intbitset==3.0.1
 packageurl-python==0.10.0
-packaging==21.3
 packvers==21.5
-pip-requirements-parser==32.0.1
+pip-requirements-parser==31.2.0
 pkginfo2==30.0.0
 pyparsing==3.0.9
 PyYAML==6.0

requirements_builder.ABOUT

@@ -62,7 +62,7 @@ install_requires =
     importlib_metadata >= 4.12.0
     packageurl_python >= 0.9.0
     pkginfo2 >= 30.0.0
-    pip-requirements-parser >= 32.0.1
+    pip-requirements-parser >= 31.2.0
     requests >= 2.18.0
     resolvelib >= 0.8.1
     saneyaml >= 0.5.2

setup.cfg

@@ -62,14 +62,14 @@ install_requires =
     importlib_metadata >= 4.12.0
     packageurl_python >= 0.9.0
     pkginfo2 >= 30.0.0
-    pip-requirements-parser >= 32.0.1
+    pip-requirements-parser >= 31.2.0
     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.3
+    # packaging >= 21.3
     packvers >= 21.5
 [options.packages.find]
 where = src

src/_packagedcode/pypi.py

@@ -22,15 +22,15 @@
 import zipfile
 
 import dparse2
-import packaging
+import packvers
 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
@@ -786,7 +786,7 @@ def parse_reqs(cls, reqs, scope):
         """ 
         dependent_packages = []
         for req in reqs:
-            req_parsed = packaging.requirements.Requirement(str(req))
+            req_parsed = packvers.requirements.Requirement(str(req))
             name = canonicalize_name(req_parsed.name)
             purl = PackageURL(type="pypi", name=name)
             specifiers = req_parsed.specifier._specs

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

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

@@ -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}"