81 lines
2.8 KiB
Diff
81 lines
2.8 KiB
Diff
|
Index: pip_api-0.0.34/pip_api/__init__.py
|
||
|
|
===================================================================
|
||
|
|
--- pip_api-0.0.34.orig/pip_api/__init__.py
|
||
|
|
+++ pip_api-0.0.34/pip_api/__init__.py
|
||
|
|
@@ -1,7 +1,7 @@
|
||
|
|
import sys
|
||
|
|
|
||
|
|
-from pip_api._vendor.packaging import version as packaging_version
|
||
|
|
-from pip_api._vendor.packaging.version import Version
|
||
|
|
+from packaging import version as packaging_version
|
||
|
|
+from packaging.version import Version
|
||
|
|
|
||
|
|
# Import this now because we need it below
|
||
|
|
from pip_api._version import version
|
||
|
|
Index: pip_api-0.0.34/pip_api/_hash.py
|
||
|
|
===================================================================
|
||
|
|
--- pip_api-0.0.34.orig/pip_api/_hash.py
|
||
|
|
+++ pip_api-0.0.34/pip_api/_hash.py
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
import os
|
||
|
|
|
||
|
|
-from pip_api._vendor.packaging.version import Version # type: ignore
|
||
|
|
+from packaging.version import Version # type: ignore
|
||
|
|
|
||
|
|
import pip_api
|
||
|
|
from pip_api._call import call
|
||
|
|
Index: pip_api-0.0.34/pip_api/_installed_distributions.py
|
||
|
|
===================================================================
|
||
|
|
--- pip_api-0.0.34.orig/pip_api/_installed_distributions.py
|
||
|
|
+++ pip_api-0.0.34/pip_api/_installed_distributions.py
|
||
|
|
@@ -7,7 +7,7 @@ import pip_api
|
||
|
|
from pip_api._call import call
|
||
|
|
from pip_api.exceptions import PipError
|
||
|
|
|
||
|
|
-from pip_api._vendor.packaging.version import parse # type: ignore
|
||
|
|
+from packaging.version import parse # type: ignore
|
||
|
|
|
||
|
|
|
||
|
|
class Distribution:
|
||
|
|
Index: pip_api-0.0.34/pip_api/_parse_requirements.py
|
||
|
|
===================================================================
|
||
|
|
--- pip_api-0.0.34.orig/pip_api/_parse_requirements.py
|
||
|
|
+++ pip_api-0.0.34/pip_api/_parse_requirements.py
|
||
|
|
@@ -11,8 +11,8 @@ from typing import Any, Dict, Optional,
|
||
|
|
from urllib.parse import unquote, urljoin, urlsplit
|
||
|
|
from urllib.request import pathname2url, url2pathname
|
||
|
|
|
||
|
|
-from pip_api._vendor import tomli
|
||
|
|
-from pip_api._vendor.packaging import requirements, specifiers # type: ignore
|
||
|
|
+import tomli
|
||
|
|
+from packaging import requirements, specifiers # type: ignore
|
||
|
|
from pip_api.exceptions import PipError
|
||
|
|
|
||
|
|
parser = argparse.ArgumentParser()
|
||
|
|
Index: pip_api-0.0.34/tests/conftest.py
|
||
|
|
===================================================================
|
||
|
|
--- pip_api-0.0.34.orig/tests/conftest.py
|
||
|
|
+++ pip_api-0.0.34/tests/conftest.py
|
||
|
|
@@ -6,7 +6,7 @@ import pytest
|
||
|
|
import pretend
|
||
|
|
import virtualenv
|
||
|
|
|
||
|
|
-from pip_api._vendor.packaging.version import Version
|
||
|
|
+from packaging.version import Version
|
||
|
|
|
||
|
|
import pip_api
|
||
|
|
|
||
|
|
Index: pip_api-0.0.34/tests/test_installed_distributions.py
|
||
|
|
===================================================================
|
||
|
|
--- pip_api-0.0.34.orig/tests/test_installed_distributions.py
|
||
|
|
+++ pip_api-0.0.34/tests/test_installed_distributions.py
|
||
|
|
@@ -2,7 +2,7 @@ import os
|
||
|
|
import pytest
|
||
|
|
|
||
|
|
import pip_api
|
||
|
|
-from pip_api._vendor.packaging.version import parse
|
||
|
|
+from packaging.version import parse
|
||
|
|
from pip_api.exceptions import PipError
|
||
|
|
|
||
|
|
|