Merge remote-tracking branch 'origin/main' into sqlalchemy-opt

This commit is contained in:
renaud 2024-05-22 14:57:20 -07:00
commit c7853ee3e1
4 changed files with 13 additions and 11 deletions

View file

@ -64,10 +64,11 @@ def ensure_pr_number() -> bool:
return True
def ensure_git_repo(module_root: str) -> bool:
def ensure_git_repo(module_root: str) -> tuple[bool, bool]:
# return type is (should_continue, disable_PR_creation)
try:
_ = git.Repo(module_root, search_parent_directories=True).git_dir
return True
return True, False
except git.exc.InvalidGitRepositoryError:
# Only ask for the prompt if running in non-interactive mode
if sys.__stdin__.isatty():
@ -78,9 +79,9 @@ def ensure_git_repo(module_root: str) -> bool:
show_choices=True,
)
if response == "no":
return False
return False, True
if response == "yes":
return True
return True, True
else:
# continue running, important for GitHub actions
return True
return True, False

View file

@ -315,9 +315,7 @@ def process_test_files(
scope_parameters = test_functions_list[index].parameters
test_type = test_functions_list[index].test_type
try:
definition = script.goto(
line=name.line,
column=name.column,
definition = name.goto(
follow_imports=True,
follow_builtin_imports=False,
)

View file

@ -131,9 +131,12 @@ class Optimizer:
logging.info("Running optimizer.")
if not env_utils.ensure_codeflash_api_key():
return
if not env_utils.ensure_git_repo(module_root=self.args.module_root):
continue_execution, disable_pr = env_utils.ensure_git_repo(module_root=self.args.module_root)
if not continue_execution:
logging.error("No git repository detected and user aborted run. Exiting...")
sys.exit(1)
if disable_pr:
self.args.no_pr = True
file_to_funcs_to_optimize: dict[str, list[FunctionToOptimize]]
num_optimizable_functions: int

View file

@ -1,3 +1,3 @@
# These version placeholders will be replaced by poetry-dynamic-versioning during `poetry build`.
__version__ = "0.6.2"
__version_tuple__ = (0, 6, 2)
__version__ = "0.6.3"
__version_tuple__ = (0, 6, 3)