From 3b345781ca8cb03ee83765153956a6ef593bbb57 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 9 Mar 2026 23:18:02 +0000 Subject: [PATCH 1/2] Initial plan From cdbbc812ca30670c4b90237eab1bf1f8baf2ce25 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 9 Mar 2026 23:21:44 +0000 Subject: [PATCH 2/2] Merge against main: remove darker dependency, keep urllib3==2.6.3 security bump Co-authored-by: damyanp <8118402+damyanp@users.noreply.github.com> --- utils/git/code-format-helper.py | 41 +----------------------- utils/git/requirements_formatting.txt | 30 ++++------------- utils/git/requirements_formatting.txt.in | 2 -- 3 files changed, 7 insertions(+), 66 deletions(-) diff --git a/utils/git/code-format-helper.py b/utils/git/code-format-helper.py index 7e71166059..f60f7aa3de 100644 --- a/utils/git/code-format-helper.py +++ b/utils/git/code-format-helper.py @@ -153,46 +153,7 @@ def format_run(self, changed_files: [str], args: argparse.Namespace) -> str | No return None -class DarkerFormatHelper(FormatHelper): - name = "darker" - friendly_name = "Python code formatter" - - @property - def instructions(self): - return " ".join(self.darker_cmd) - - def filter_changed_files(self, changed_files: [str]) -> [str]: - filtered_files = [] - for path in changed_files: - name, ext = os.path.splitext(path) - if ext == ".py": - filtered_files.append(path) - - return filtered_files - - def format_run(self, changed_files: [str], args: argparse.Namespace) -> str | None: - py_files = self.filter_changed_files(changed_files) - if not py_files: - return - darker_cmd = [ - "darker", - "--check", - "--diff", - "-r", - f"{args.start_rev}..{args.end_rev}", - ] + py_files - print(f"Running: {' '.join(darker_cmd)}") - self.darker_cmd = darker_cmd - proc = subprocess.run(darker_cmd, capture_output=True) - - # formatting needed - if proc.returncode == 1: - return proc.stdout.decode("utf-8") - - return None - - -ALL_FORMATTERS = (DarkerFormatHelper(), ClangFormatHelper()) +ALL_FORMATTERS = (ClangFormatHelper(),) if __name__ == "__main__": parser = argparse.ArgumentParser() diff --git a/utils/git/requirements_formatting.txt b/utils/git/requirements_formatting.txt index 7667d806f1..21013b7173 100644 --- a/utils/git/requirements_formatting.txt +++ b/utils/git/requirements_formatting.txt @@ -1,51 +1,33 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --output-file=llvm/utils/git/requirements_formatting.txt llvm/utils/git/requirements_formatting.txt.in +# pip-compile --output-file=utils/git/requirements_formatting.txt utils/git/requirements_formatting.txt.in # -black==24.3.0 - # via - # -r llvm/utils/git/requirements_formatting.txt.in - # darker certifi==2024.7.4 # via requests -cffi==1.15.1 +cffi==2.0.0 # via # cryptography # pynacl charset-normalizer==3.2.0 # via requests -click==8.1.7 - # via black -cryptography==44.0.1 +cryptography==46.0.5 # via pyjwt -darker==1.7.2 - # via -r llvm/utils/git/requirements_formatting.txt.in deprecated==1.2.14 # via pygithub idna==3.7 # via requests -mypy-extensions==1.0.0 - # via black -packaging==23.1 - # via black -pathspec==0.11.2 - # via black -platformdirs==3.10.0 - # via black pycparser==2.21 # via cffi pygithub==1.59.1 - # via -r llvm/utils/git/requirements_formatting.txt.in + # via -r utils/git/requirements_formatting.txt.in pyjwt[crypto]==2.8.0 # via pygithub -pynacl==1.6.2 +pynacl==1.5.0 # via pygithub requests==2.32.4 # via pygithub -toml==0.10.2 - # via darker urllib3==2.6.3 # via requests wrapt==1.15.0 diff --git a/utils/git/requirements_formatting.txt.in b/utils/git/requirements_formatting.txt.in index 244cb435a0..33c997c022 100644 --- a/utils/git/requirements_formatting.txt.in +++ b/utils/git/requirements_formatting.txt.in @@ -1,3 +1 @@ -black~=24.3 -darker==1.7.2 PyGithub==1.59.1