Skip to content

walrus a bit #1517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonebig merged 1 commit into from
Mar 23, 2025
Merged

walrus a bit #1517

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ def find_7zip_executable() -> str:
Path(sys.prefix).parent / "t" ,
]
for base_dir in possible_program_files:
executable_path = base_dir / "7-Zip" / "7z.exe"
if executable_path.is_file():
if (executable_path := base_dir / "7-Zip" / "7z.exe").is_file():
return str(executable_path)
raise RuntimeError("7ZIP is not installed on this computer.")

Expand Down Expand Up @@ -180,9 +179,8 @@ def __init__(

def _get_python_zip_file(self) -> Path:
"""Finds the Python .zip file in the wheels directory."""
pattern = r"(pypy3|python-)([0-9]|[a-zA-Z]|.)*.zip"
for filename in os.listdir(self.wheels_directory):
if re.match(pattern, filename):
if re.match("(pypy3|python-)([0-9]|[a-zA-Z]|.)*.zip", filename):
return self.wheels_directory / filename
raise RuntimeError(f"Could not find Python zip package in {self.wheels_directory}")

Expand Down Expand Up @@ -305,8 +303,7 @@ def pre_path_entries(self) -> list[str]:
@property
def documentation_directories_list(self) -> list[Path]:
"""Returns the list of documentation directories to include."""
default_docs_directory = Path(__file__).resolve().parent / "docs"
if default_docs_directory.is_dir():
if (default_docs_directory := Path(__file__).parent / "docs").is_dir():
return [default_docs_directory] + self.documentation_directories
return self.documentation_directories

Expand Down Expand Up @@ -371,7 +368,7 @@ def _copy_essential_files(self):

tools_target_directory = self.winpython_directory / "t"
self._print_action(f"Copying tools to {tools_target_directory}")
_copy_items(self.tools_directories, self.winpython_directory / "t", self.verbose)
_copy_items(self.tools_directories, tools_target_directory, self.verbose)

# Special handling for Node.js to move it up one level
nodejs_current_directory = tools_target_directory / "n"
Expand Down