Skip to content

Commit 88be605

Browse files
committed
fixup! Fix formatting with 'make valid'
Signed-off-by: Bennati, Stefano <stefano.bennati@here.com>
1 parent 25fc03f commit 88be605

File tree

10 files changed

+41
-25
lines changed

10 files changed

+41
-25
lines changed

etc/scripts/check_thirdparty.py

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

1415

etc/scripts/fetch_thirdparty.py

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

1616
import click
17-
import utils_requirements
17+
1818
import utils_thirdparty
19+
import utils_requirements
1920

2021
TRACE = False
2122
TRACE_DEEP = False

etc/scripts/test_utils_pip_compatibility_tags.py

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

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

3131
import pytest
32+
3233
import utils_pip_compatibility_tags
3334

3435

etc/scripts/test_utils_pypi_supported_tags.py

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

1313
import pytest
14+
1415
from utils_pypi_supported_tags import validate_platforms_for_pypi
1516

1617
"""

etc/scripts/utils_dejacode.py

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

1515
import requests
1616
import saneyaml
17+
1718
from packaging import version as packaging_version
1819

1920
"""

etc/scripts/utils_pip_compatibility_tags.py

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

2828
import re
2929

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

3439
_osx_arch_pat = re.compile(r"(.+)_(\d+)_(\d+)_(.+)")
3540

etc/scripts/utils_thirdparty.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@
2525
import packageurl
2626
import requests
2727
import saneyaml
28-
import utils_pip_compatibility_tags
2928
from commoncode import fileutils
3029
from commoncode.hash import multi_checksums
3130
from commoncode.text import python_safe_name
3231
from packaging import tags as packaging_tags
3332
from packaging import version as packaging_version
3433

34+
import utils_pip_compatibility_tags
35+
3536
"""
3637
Utilities to manage Python thirparty libraries source, binaries and metadata in
3738
local directories and remote repositories.

src/_packagedcode/models.py

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

1515
import attr
16+
from packageurl import normalize_qualifiers
17+
from packageurl import PackageURL
18+
1619
from commoncode import filetype
17-
from commoncode.datautils import (Boolean, Date, Integer, List, Mapping,
18-
String, choices)
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
1927
from commoncode.fileutils import as_posixpath
2028
from commoncode.resource import Resource
21-
from packageurl import PackageURL, normalize_qualifiers
22-
2329
try:
2430
from typecode import contenttype
2531
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-
import base64
12+
from configparser import ConfigParser
1313
import copy
1414
import json
1515
import logging
16+
from pathlib import Path
1617
import os
1718
import re
1819
import sys
20+
from typing import NamedTuple
1921
import tempfile
2022
import zipfile
21-
from configparser import ConfigParser
22-
from pathlib import Path
23-
from typing import NamedTuple
24-
2523
import dparse2
26-
# FIXME: we always want to use the external library rather than the built-in for now
27-
import importlib_metadata
2824
import packvers as packaging
2925
import pip_requirements_parser
3026
import pkginfo2
3127
from commoncode import fileutils
32-
from commoncode.fileutils import as_posixpath
28+
from packvers.specifiers import SpecifierSet
3329
from packageurl import PackageURL
3430
from packvers import markers
3531
from packvers.requirements import Requirement
36-
from packvers.specifiers import SpecifierSet
3732
from packvers.utils import canonicalize_name
38-
3933
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)
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+
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
4343

4444
try:
4545
from zipfile import Path as ZipPath

src/_packagedcode/utils.py

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

1010
try:
1111
from license_expression import Licensing
12-
from license_expression import \
13-
combine_expressions as le_combine_expressions
12+
from license_expression import combine_expressions as le_combine_expressions
1413
except:
1514
Licensing = None
1615
le_combine_expressions = None

0 commit comments

Comments
 (0)