Skip to content

Handle cog requirement reinstall in redbot-update #6756

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

Open
Jackenmen wants to merge 1 commit into
base: V3/develop
Choose a base branch
from
+43 −2
Open

Handle cog requirement reinstall in redbot-update #6756

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
45 changes: 43 additions & 2 deletions redbot/_update/internal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ async def _run_cog_update(bot: Red, *, update_repos: bool) -> None:
console = common.get_console(stderr=True)

instance_name = data_manager.instance_name()
last_known_prefix = await bot._config.last_system_info.python_prefix()
last_system_info = await bot._config.last_system_info()
last_known_prefix = last_system_info["python_prefix"]
same_install = False
if last_known_prefix is not None:
try:
Expand All @@ -78,11 +79,41 @@ async def _run_cog_update(bot: Red, *, update_repos: bool) -> None:
" instance.",
console=console,
)

await _downloader._init(bot)

ver_info = list(sys.version_info[:2])
if ver_info != last_system_info["python_version"]:
await bot._config.last_system_info.python_version.set(ver_info)
if any(_downloader.LIB_PATH.iterdir()):
shutil.rmtree(str(_downloader.LIB_PATH))
_downloader.LIB_PATH.mkdir()
common.print_with_prefix_column(
common.ICON_INFO,
"We detected a change in minor Python version and cleared packages in lib folder.",
)
status = Text.assemble(
"Reinstalling cog requirements on the ", (instance_name, "bold"), " instance..."
)
with console.status(status):
failed_reqs, failed_libs = await _downloader.reinstall_requirements()
if failed_reqs:
common.print_with_prefix_column(
common.ICON_ERROR,
"Failed to reinstall requirements: ",
Text(", ").join(Text(req, style="bold") for req in failed_reqs),
)
if failed_libs:
common.print_with_prefix_column(
common.ICON_ERROR,
"Failed to reinstall shared libraries: ",
Text(", ").join(Text(lib.name, style="bold") for lib in failed_libs),
)

status = Text.assemble(
"Update cogs installed on the ", (instance_name, "bold"), " instance..."
)
with console.status(status):
await _downloader._init_without_bot(bot._cog_mgr)
result = await _downloader.update_cogs(update_repos=update_repos)

common.print_with_prefix_column(
Expand Down Expand Up @@ -211,6 +242,16 @@ async def _finish_update() -> None:
),
)

old_python_version = updater_metadata.current_python_version.release[:2]
new_python_version = updater_metadata.interpreter_version.release[:2]
if old_python_version != new_python_version:
common.print_with_prefix_column(
common.ICON_INFO,
"Downloader's library folder needs to be regenerated"
" because the used Python version changed.\n"
"Choosing to update cogs now will perform this step automatically.",
)

update_cogs = updater_metadata.options.update_cogs
if update_cogs is None:
if updater_metadata.options.interactive:
Expand Down
Loading