|
9 | 9 | # |
10 | 10 |
|
11 | 11 | import ast |
12 | | -from configparser import ConfigParser |
| 12 | +import base64 |
13 | 13 | import copy |
14 | 14 | import json |
15 | 15 | import logging |
16 | | -from pathlib import Path |
17 | 16 | import os |
18 | 17 | import re |
19 | 18 | import sys |
20 | | -from typing import NamedTuple |
21 | 19 | import tempfile |
22 | 20 | import zipfile |
| 21 | +from configparser import ConfigParser |
| 22 | +from pathlib import Path |
| 23 | +from typing import NamedTuple |
| 24 | + |
23 | 25 | import dparse2 |
| 26 | +# FIXME: we always want to use the external library rather than the built-in for now |
| 27 | +import importlib_metadata |
24 | 28 | import packvers as packaging |
25 | 29 | import pip_requirements_parser |
26 | 30 | import pkginfo2 |
27 | 31 | from commoncode import fileutils |
28 | | -from packvers.specifiers import SpecifierSet |
| 32 | +from commoncode.fileutils import as_posixpath |
29 | 33 | from packageurl import PackageURL |
30 | 34 | from packvers import markers |
31 | 35 | from packvers.requirements import Requirement |
| 36 | +from packvers.specifiers import SpecifierSet |
32 | 37 | from packvers.utils import canonicalize_name |
33 | | -from _packagedcode import models |
34 | | -from _packagedcode.utils import build_description |
35 | | -from _packagedcode.utils import combine_expressions |
36 | | -from _packagedcode.utils import yield_dependencies_from_package_data |
37 | | -from _packagedcode.utils import yield_dependencies_from_package_resource |
38 | 38 |
|
39 | | -# FIXME: we always want to use the external library rather than the built-in for now |
40 | | -import importlib_metadata |
41 | | -import base64 |
42 | | -from commoncode.fileutils import as_posixpath |
| 39 | +from _packagedcode import models |
| 40 | +from _packagedcode.utils import (build_description, combine_expressions, |
| 41 | + yield_dependencies_from_package_data, |
| 42 | + yield_dependencies_from_package_resource) |
43 | 43 |
|
44 | 44 | try: |
45 | 45 | from zipfile import Path as ZipPath |
|
0 commit comments