Format code

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Author: pombredanne

etc/scripts/check_thirdparty.py

@@ -16,8 +16,7 @@
 @click.option(
     "-d",
     "--dest",
-    type=click.Path(exists=True, readable=True,
-                    path_type=str, file_okay=False),
+    type=click.Path(exists=True, readable=True, path_type=str, file_okay=False),
     required=True,
     help="Path to the thirdparty directory to check.",
 )

etc/scripts/fetch_thirdparty.py

@@ -55,8 +55,7 @@
     "-d",
     "--dest",
     "dest_dir",
-    type=click.Path(exists=True, readable=True,
-                    path_type=str, file_okay=False),
+    type=click.Path(exists=True, readable=True, path_type=str, file_okay=False),
     metavar="DIR",
     default=utils_thirdparty.THIRDPARTY_DIR,
     show_default=True,
@@ -121,7 +120,7 @@
     show_default=False,
     multiple=True,
     help="Package name(s) that come only in sdist format (no wheels). "
-         "The command will not fail and exit if no wheel exists for these names",
+    "The command will not fail and exit if no wheel exists for these names",
 )
 @click.option(
     "--wheel-only",
@@ -132,7 +131,7 @@
     show_default=False,
     multiple=True,
     help="Package name(s) that come only in wheel format (no sdist). "
-         "The command will not fail and exit if no sdist exists for these names",
+    "The command will not fail and exit if no sdist exists for these names",
 )
 @click.option(
     "--no-dist",
@@ -143,7 +142,7 @@
     show_default=False,
     multiple=True,
     help="Package name(s) that do not come either in wheel or sdist format. "
-         "The command will not fail and exit if no distribution exists for these names",
+    "The command will not fail and exit if no distribution exists for these names",
 )
 @click.help_option("-h", "--help")
 def fetch_thirdparty(
@@ -225,8 +224,7 @@ def fetch_thirdparty(
     environments = None
     if wheels:
         evts = itertools.product(python_versions, operating_systems)
-        environments = [utils_thirdparty.Environment.from_pyver_and_os(
-            pyv, os) for pyv, os in evts]
+        environments = [utils_thirdparty.Environment.from_pyver_and_os(pyv, os) for pyv, os in evts]
 
     # Collect PyPI repos
     repos = []
@@ -250,7 +248,6 @@ def fetch_thirdparty(
         print(f"Processing: {name} @ {version}")
         if wheels:
             for environment in environments:
-
                 if TRACE:
                     print(f"  ==> Fetching wheel for envt: {environment}")
 
@@ -262,14 +259,11 @@ def fetch_thirdparty(
                     repos=repos,
                 )
                 if not fetched:
-                    wheels_or_sdist_not_found[f"{name}=={version}"].append(
-                        environment)
+                    wheels_or_sdist_not_found[f"{name}=={version}"].append(environment)
                     if TRACE:
                         print(f"      NOT FOUND")
 
-        if (sdists or
-            (f"{name}=={version}" in wheels_or_sdist_not_found and name in sdist_only)
-            ):
+        if sdists or (f"{name}=={version}" in wheels_or_sdist_not_found and name in sdist_only):
             if TRACE:
                 print(f"  ==> Fetching sdist: {name}=={version}")
 
@@ -292,8 +286,7 @@ def fetch_thirdparty(
         sdist_missing = sdists and "sdist" in dists and not name in wheel_only
         if sdist_missing:
             mia.append(f"SDist missing: {nv} {dists}")
-        wheels_missing = wheels and any(
-            d for d in dists if d != "sdist") and not name in sdist_only
+        wheels_missing = wheels and any(d for d in dists if d != "sdist") and not name in sdist_only
         if wheels_missing:
             mia.append(f"Wheels missing: {nv} {dists}")
 
@@ -303,8 +296,7 @@ def fetch_thirdparty(
         raise Exception(mia)
 
     print(f"==> FETCHING OR CREATING ABOUT AND LICENSE FILES")
-    utils_thirdparty.fetch_abouts_and_licenses(
-        dest_dir=dest_dir, use_cached_index=use_cached_index)
+    utils_thirdparty.fetch_abouts_and_licenses(dest_dir=dest_dir, use_cached_index=use_cached_index)
     utils_thirdparty.clean_about_files(dest_dir=dest_dir)
 
     # check for problems

etc/scripts/gen_pypi_simple.py

@@ -69,7 +69,6 @@ def get_package_name_from_filename(filename):
             raise InvalidDistributionFilename(filename)
 
     elif filename.endswith(wheel_ext):
-
         wheel_info = get_wheel_from_filename(filename)
 
         if not wheel_info:
@@ -200,11 +199,10 @@ def build_pypi_index(directory, base_url="https://thirdparty.aboutcode.org/pypi"
     simple_html_index = [
         "<!DOCTYPE html>",
         "<html><head><title>PyPI Simple Index</title>",
-        '<meta charset="UTF-8">' '<meta name="api-version" value="2" /></head><body>',
+        '<meta charset="UTF-8"><meta name="api-version" value="2" /></head><body>',
     ]
 
     for pkg_file in directory.iterdir():
-
         pkg_filename = pkg_file.name
 
         if (

etc/scripts/utils_dejacode.py

@@ -32,8 +32,7 @@
 
 def can_do_api_calls():
     if not DEJACODE_API_KEY and DEJACODE_API_URL:
-        print(
-            "DejaCode DEJACODE_API_KEY and DEJACODE_API_URL not configured. Doing nothing")
+        print("DejaCode DEJACODE_API_KEY and DEJACODE_API_URL not configured. Doing nothing")
         return False
     else:
         return True
@@ -68,8 +67,7 @@ def get_package_data(distribution):
         return results[0]
 
     elif len_results > 1:
-        print(
-            f"More than 1 entry exists, review at: {DEJACODE_API_URL_PACKAGES}")
+        print(f"More than 1 entry exists, review at: {DEJACODE_API_URL_PACKAGES}")
     else:
         print("Could not find package:", distribution.download_url)
 
@@ -150,12 +148,11 @@ def find_latest_dejacode_package(distribution):
     # there was no exact match, find the latest version
     # TODO: consider the closest version rather than the latest
     # or the version that has the best data
-    with_versions = [(packaging_version.parse(p["version"]), p)
-                     for p in packages]
+    with_versions = [(packaging_version.parse(p["version"]), p) for p in packages]
     with_versions = sorted(with_versions)
     latest_version, latest_package_version = sorted(with_versions)[-1]
     print(
-        f"Found DejaCode latest version: {latest_version} " f"for dist: {distribution.package_url}",
+        f"Found DejaCode latest version: {latest_version} for dist: {distribution.package_url}",
     )
 
     return latest_package_version
@@ -181,7 +178,7 @@ def create_dejacode_package(distribution):
     }
 
     fields_to_carry_over = [
-        "download_url" "type",
+        "download_urltype",
         "namespace",
         "name",
         "version",
@@ -209,5 +206,5 @@ def create_dejacode_package(distribution):
     if response.status_code != 201:
         raise Exception(f"Error, cannot create package for: {distribution}")
 
-    print(f'New Package created at: {new_package_data["absolute_url"]}')
+    print(f"New Package created at: {new_package_data['absolute_url']}")
     return new_package_data

etc/scripts/utils_requirements.py

@@ -106,8 +106,7 @@ def lock_dev_requirements(
     all_req_nvs = get_required_name_versions(all_req_lines)
     dev_only_req_nvs = {n: v for n, v in all_req_nvs if n not in main_names}
 
-    new_reqs = "\n".join(
-        f"{n}=={v}" for n, v in sorted(dev_only_req_nvs.items()))
+    new_reqs = "\n".join(f"{n}=={v}" for n, v in sorted(dev_only_req_nvs.items()))
     with open(dev_requirements_file, "w") as fo:
         fo.write(new_reqs)
 
@@ -118,12 +117,10 @@ def get_installed_reqs(site_packages_dir):
     as a text.
     """
     if not os.path.exists(site_packages_dir):
-        raise Exception(
-            f"site_packages directory: {site_packages_dir!r} does not exists")
+        raise Exception(f"site_packages directory: {site_packages_dir!r} does not exists")
     # Also include these packages in the output with --all: wheel, distribute,
     # setuptools, pip
-    args = ["pip", "freeze", "--exclude-editable",
-            "--all", "--path", site_packages_dir]
+    args = ["pip", "freeze", "--exclude-editable", "--all", "--path", site_packages_dir]
     return subprocess.check_output(args, encoding="utf-8")  # noqa: S603