Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup previous PR

Browse Source
This commit is contained in:
Kovid Goyal 2024-12-17 19:22:09 +05:30
parent 8900fe2fbc
commit 89e88b9678
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
setup/check.py
View File

@ -11,7 +11,7 @@ import json
import os import os
import subprocess import subprocess
from setup import Command, build_cache_dir, dump_json, edit_file from setup import Command, build_cache_dir, dump_json, edit_file, require_clean_git, require_git_master
class Message: class Message:
@ -98,23 +98,16 @@ class Check(Command):
return p.wait() != 0 return p.wait() != 0
def perform_auto_fix(self): def perform_auto_fix(self):
p = subprocess.Popen(['ruff', 'check', '--fix-only'], text=True, stdout=subprocess.PIPE) cp = subprocess.run(['ruff', 'check', '--fix-only'], stdout=subprocess.PIPE)
msg = p.stdout.read().strip() if cp.returncode != 0:
if not msg: raise SystemExit('ruff fixing failed')
msg = 'Fixed 0 error.' return cp.stdout.decode('utf-8') or 'Fixed 0 errors.'
return msg
def perform_pep8_git_commit(self): def perform_pep8_git_commit(self):
p = subprocess.Popen(['git', 'commit', '--all', '-m pep8']) return subprocess.run(['git', 'commit', '--all', '-m pep8']).returncode != 0
return p.wait() != 0
def check_working_tree(self):
p = subprocess.Popen(['git', 'status', '--short'], text=True, stdout=subprocess.PIPE)
return bool(p.stdout.read().strip())
def check_errors_remain(self): def check_errors_remain(self):
p = subprocess.Popen(['ruff', 'check', '--statistics'], stdout=subprocess.PIPE) return subprocess.run(['ruff', 'check', '--statistics']).returncode != 0
return p.wait() != 0
def run(self, opts): def run(self, opts):
if opts.fix and opts.pep8: if opts.fix and opts.pep8:
@ -159,16 +152,15 @@ class Check(Command):
self.save_cache(cache) self.save_cache(cache)
def run_pep8_commit(self): def run_pep8_commit(self):
if self.check_working_tree(): require_git_master()
self.info('Their is pending change into the working tree. Abort.') require_clean_git()
raise SystemExit(1)
msg = self.perform_auto_fix() msg = self.perform_auto_fix()
self.info(msg+'\n') self.info(msg+'\n')
self.info('Commit the pep8 change...') self.info('Commit the pep8 change...')
self.perform_pep8_git_commit() self.perform_pep8_git_commit()
self.info() self.info()
if self.check_errors_remain(): if self.check_errors_remain():
self.info('Their is remaing errors. Execute "setup.py check" without option to locate them.') self.info('There are remaining errors. Execute "setup.py check" without options to locate them.')
def report_errors(self, errors): def report_errors(self, errors):
for err in errors: for err in errors: