Skip to content

Commit 4788ecd

Browse files
committed
run isort to sort imports
Signed-off-by: Bennati, Stefano <stefano.bennati@here.com>
1 parent 9b7b489 commit 4788ecd

25 files changed

+77
-157
lines changed

etc/scripts/check_thirdparty.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
# See https://aboutcode.org for more information about nexB OSS projects.
1010
#
1111
import click
12-
1312
import utils_thirdparty
1413

1514

etc/scripts/fetch_thirdparty.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
import sys
1515

1616
import click
17-
18-
import utils_thirdparty
1917
import utils_requirements
18+
import utils_thirdparty
2019

2120
TRACE = False
2221
TRACE_DEEP = False

etc/scripts/test_utils_pip_compatibility_tags.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@
2525
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2626
"""
2727

28-
from unittest.mock import patch
2928
import sysconfig
29+
from unittest.mock import patch
3030

3131
import pytest
32-
3332
import utils_pip_compatibility_tags
3433

3534

etc/scripts/test_utils_pypi_supported_tags.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
# limitations under the License.
1212

1313
import pytest
14-
1514
from utils_pypi_supported_tags import validate_platforms_for_pypi
1615

1716
"""

etc/scripts/utils_dejacode.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
import requests
1616
import saneyaml
17-
1817
from packaging import version as packaging_version
1918

2019
"""

etc/scripts/utils_pip_compatibility_tags.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,9 @@
2727

2828
import re
2929

30-
from packaging.tags import (
31-
compatible_tags,
32-
cpython_tags,
33-
generic_tags,
34-
interpreter_name,
35-
interpreter_version,
36-
mac_platforms,
37-
)
30+
from packaging.tags import (compatible_tags, cpython_tags, generic_tags,
31+
interpreter_name, interpreter_version,
32+
mac_platforms)
3833

3934
_osx_arch_pat = re.compile(r"(.+)_(\d+)_(\d+)_(.+)")
4035

etc/scripts/utils_thirdparty.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525
import packageurl
2626
import requests
2727
import saneyaml
28+
import utils_pip_compatibility_tags
2829
from commoncode import fileutils
2930
from commoncode.hash import multi_checksums
3031
from commoncode.text import python_safe_name
3132
from packaging import tags as packaging_tags
3233
from packaging import version as packaging_version
3334

34-
import utils_pip_compatibility_tags
35-
3635
"""
3736
Utilities to manage Python thirparty libraries source, binaries and metadata in
3837
local directories and remote repositories.

src/_packagedcode/models.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,13 @@
1313
from fnmatch import fnmatchcase
1414

1515
import attr
16-
from packageurl import normalize_qualifiers
17-
from packageurl import PackageURL
18-
1916
from commoncode import filetype
20-
from commoncode.datautils import choices
21-
from commoncode.datautils import Boolean
22-
from commoncode.datautils import Date
23-
from commoncode.datautils import Integer
24-
from commoncode.datautils import List
25-
from commoncode.datautils import Mapping
26-
from commoncode.datautils import String
17+
from commoncode.datautils import (Boolean, Date, Integer, List, Mapping,
18+
String, choices)
2719
from commoncode.fileutils import as_posixpath
2820
from commoncode.resource import Resource
21+
from packageurl import PackageURL, normalize_qualifiers
22+
2923
try:
3024
from typecode import contenttype
3125
except ImportError:

src/_packagedcode/pypi.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@
99
#
1010

1111
import ast
12-
from configparser import ConfigParser
12+
import base64
1313
import copy
1414
import json
1515
import logging
16-
from pathlib import Path
1716
import os
1817
import re
1918
import sys
20-
from typing import NamedTuple
2119
import tempfile
2220
import zipfile
21+
from configparser import ConfigParser
22+
from pathlib import Path
23+
from typing import NamedTuple
24+
2325
import dparse2
26+
# FIXME: we always want to use the external library rather than the built-in for now
27+
import importlib_metadata
2428
import packvers as packaging
2529
import pip_requirements_parser
2630
import pkginfo2
2731
from commoncode import fileutils
28-
from packvers.specifiers import SpecifierSet
32+
from commoncode.fileutils import as_posixpath
2933
from packageurl import PackageURL
3034
from packvers import markers
3135
from packvers.requirements import Requirement
36+
from packvers.specifiers import SpecifierSet
3237
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
3838

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)
4343

4444
try:
4545
from zipfile import Path as ZipPath

src/_packagedcode/utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99

1010
try:
1111
from license_expression import Licensing
12-
from license_expression import combine_expressions as le_combine_expressions
12+
from license_expression import \
13+
combine_expressions as le_combine_expressions
1314
except:
1415
Licensing = None
1516
le_combine_expressions = None

0 commit comments

Comments
 (0)