use style from spack pyproject.toml

spack · Oct 16, 2024 · d05b1c0 · d05b1c0
1 parent e8acdd6
commit d05b1c0
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 72 deletions.
diff --git a/clingo/scripts/clingo_json.py b/clingo/scripts/clingo_json.py
@@ -16,36 +16,21 @@
 
 # Dictionary that maps (OS, TARGET) to info for the spec
 SPEC_INFO = {
-    ("rhel5", "x86_64"): {
-        "spec": "clingo-bootstrap%gcc platform=linux target=x86_64",
-    },
-    ("centos7", "x86_64"): {
-        "spec": "clingo-bootstrap%gcc platform=linux target=x86_64",
-    },
-    ("centos7", "aarch64"): {
-        "spec": "clingo-bootstrap%gcc platform=linux target=aarch64",
-    },
-    ("centos7", "ppc64le"): {
-        "spec": "clingo-bootstrap%gcc platform=linux target=ppc64le",
-    },
-    ("monterey", "x86_64"): {
-        "spec": "clingo-bootstrap%apple-clang platform=darwin target=x86_64",
-    },
+    ("rhel5", "x86_64"): {"spec": "clingo-bootstrap%gcc platform=linux target=x86_64"},
+    ("centos7", "x86_64"): {"spec": "clingo-bootstrap%gcc platform=linux target=x86_64"},
+    ("centos7", "aarch64"): {"spec": "clingo-bootstrap%gcc platform=linux target=aarch64"},
+    ("centos7", "ppc64le"): {"spec": "clingo-bootstrap%gcc platform=linux target=ppc64le"},
+    ("monterey", "x86_64"): {"spec": "clingo-bootstrap%apple-clang platform=darwin target=x86_64"},
     ("ventura", "aarch64"): {
-        "spec": "clingo-bootstrap%apple-clang platform=darwin target=aarch64",
+        "spec": "clingo-bootstrap%apple-clang platform=darwin target=aarch64"
     },
 }
 
 
 def compiler_entry(name, version, os, target):
     return {
         "spec": "{0}@{1}".format(name, version),
-        "paths": {
-            "cc": "/dev/null",
-            "cxx": "/dev/null",
-            "f77": "/dev/null",
-            "fc": "/dev/null",
-        },
+        "paths": {"cc": "/dev/null", "cxx": "/dev/null", "f77": "/dev/null", "fc": "/dev/null"},
         "operating_system": "{0}".format(os),
         "target": "{0}".format(target),
         "modules": [],

diff --git a/clingo/scripts/install_clingo.py b/clingo/scripts/install_clingo.py
@@ -10,6 +10,4 @@
             f"Installing clingo-bootstrap with Python: "
             f"{spack.bootstrap.config.spec_for_current_python()}"
         )
-        install(
-            f"clingo-bootstrap@spack +optimized ~docs target={archspec.cpu.host().family}"
-        )
+        install(f"clingo-bootstrap@spack +optimized ~docs target={archspec.cpu.host().family}")
diff --git a/gnupg/scripts/gnupg_json.py b/gnupg/scripts/gnupg_json.py
@@ -18,33 +18,18 @@
 
 # Dictionary that maps (OS, TARGET) to info for the spec
 SPEC_INFO = {
-    ("centos7", "x86_64"): {
-        "spec": "[email protected]: %gcc platform=linux target=x86_64",
-    },
-    ("centos7", "aarch64"): {
-        "spec": "[email protected]: %gcc platform=linux target=aarch64",
-    },
-    ("centos7", "ppc64le"): {
-        "spec": "[email protected]: %gcc platform=linux target=ppc64le",
-    },
-    ("monterey", "x86_64"): {
-        "spec": "[email protected]: %apple-clang platform=darwin target=x86_64",
-    },
-    ("ventura", "aarch64"): {
-        "spec": "[email protected]: %apple-clang platform=darwin target=aarch64",
-    },
+    ("centos7", "x86_64"): {"spec": "[email protected]: %gcc platform=linux target=x86_64"},
+    ("centos7", "aarch64"): {"spec": "[email protected]: %gcc platform=linux target=aarch64"},
+    ("centos7", "ppc64le"): {"spec": "[email protected]: %gcc platform=linux target=ppc64le"},
+    ("monterey", "x86_64"): {"spec": "[email protected]: %apple-clang platform=darwin target=x86_64"},
+    ("ventura", "aarch64"): {"spec": "[email protected]: %apple-clang platform=darwin target=aarch64"},
 }
 
 
 def compiler_entry(name, version, os, target):
     return {
         "spec": "{0}@{1}".format(name, version),
-        "paths": {
-            "cc": "/dev/null",
-            "cxx": "/dev/null",
-            "f77": "/dev/null",
-            "fc": "/dev/null",
-        },
+        "paths": {"cc": "/dev/null", "cxx": "/dev/null", "f77": "/dev/null", "fc": "/dev/null"},
         "operating_system": "{0}".format(os),
         "target": "{0}".format(target),
         "modules": [],
@@ -80,9 +65,7 @@ def tarball_hash(path):
     s = spack.spec.Spec.from_specfile(spec_json)
     binaries = []
     for edge in reversed(
-        spack.traverse.traverse_edges_topo(
-            [s], direction="children", deptype=("link", "run")
-        )
+        spack.traverse.traverse_edges_topo([s], direction="children", deptype=("link", "run"))
     ):
         if edge.spec.external:
             continue
@@ -110,10 +93,7 @@ def tarball_hash(path):
         current_target = current_target["name"]
 
     current_hash = binary_data["gnupg"]["hash"]
-    mirror_entry = {
-        "spec": SPEC_INFO[(current_os, current_target)]["spec"],
-        "binaries": binaries,
-    }
+    mirror_entry = {"spec": SPEC_INFO[(current_os, current_target)]["spec"], "binaries": binaries}
     mirror_info.append(mirror_entry)
 
 mirror_info = sorted(mirror_info, key=lambda x: x["spec"])

diff --git a/patchelf/scripts/patchelf_json.py b/patchelf/scripts/patchelf_json.py
@@ -15,27 +15,16 @@
 
 # Dictionary that maps (OS, TARGET) to info for the spec
 SPEC_INFO = {
-    ("centos7", "x86_64"): {
-        "spec": "[email protected]: %gcc platform=linux target=x86_64",
-    },
-    ("centos7", "aarch64"): {
-        "spec": "[email protected]: %gcc platform=linux target=aarch64",
-    },
-    ("centos7", "ppc64le"): {
-        "spec": "[email protected]: %gcc platform=linux target=ppc64le",
-    },
+    ("centos7", "x86_64"): {"spec": "[email protected]: %gcc platform=linux target=x86_64"},
+    ("centos7", "aarch64"): {"spec": "[email protected]: %gcc platform=linux target=aarch64"},
+    ("centos7", "ppc64le"): {"spec": "[email protected]: %gcc platform=linux target=ppc64le"},
 }
 
 
 def compiler_entry(name, version, os, target):
     return {
         "spec": "{0}@{1}".format(name, version),
-        "paths": {
-            "cc": "/dev/null",
-            "cxx": "/dev/null",
-            "f77": "/dev/null",
-            "fc": "/dev/null",
-        },
+        "paths": {"cc": "/dev/null", "cxx": "/dev/null", "f77": "/dev/null", "fc": "/dev/null"},
         "operating_system": "{0}".format(os),
         "target": "{0}".format(target),
         "modules": [],
@@ -84,10 +73,7 @@ def tarball_hash(path):
 
     current_hash = binary_data["patchelf"]["hash"]
     binaries = [("patchelf", current_hash, shas[current_hash])]
-    mirror_entry = {
-        "spec": SPEC_INFO[(current_os, current_target)]["spec"],
-        "binaries": binaries,
-    }
+    mirror_entry = {"spec": SPEC_INFO[(current_os, current_target)]["spec"], "binaries": binaries}
     mirror_info.append(mirror_entry)
 
 mirror_info = sorted(mirror_info, key=lambda x: x["spec"])

diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,9 @@
+[tool.black]
+line-length = 99
+target-version = ['py36', 'py37', 'py38', 'py39', 'py310']
+skip_magic_trailing_comma = true
+
+[tool.isort]
+line_length = 99
+profile = "black"
+honor_noqa = true