3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update_manager: implement ability to rebuild the python env 

This implementation adds a delay that allows for pip to function correclty after the venv is built.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-11-29 06:52:08 -05:00
parent 8678e25427
commit f488e985ab
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
moonraker/plugins/update_manager.py
View File

@ -123,11 +123,16 @@ class UpdateManager:
'version_info': vinfo, 'version_info': vinfo,
'busy': self.current_update is not None} 'busy': self.current_update is not None}
async def execute_cmd(self, cmd, timeout=10., notify=False): async def execute_cmd(self, cmd, timeout=10., notify=False, retries=1):
shell_command = self.server.lookup_plugin('shell_command') shell_command = self.server.lookup_plugin('shell_command')
cb = self.notify_update_response if notify else None cb = self.notify_update_response if notify else None
scmd = shell_command.build_shell_command(cmd, callback=cb) scmd = shell_command.build_shell_command(cmd, callback=cb)
await scmd.run(timeout=timeout, verbose=notify) while retries:
if await scmd.run(timeout=timeout, verbose=notify):
break
retries -= 1
if not retries:
raise self.server.error("Shell Command Error")
async def execute_cmd_with_response(self, cmd, timeout=10.): async def execute_cmd_with_response(self, cmd, timeout=10.):
shell_command = self.server.lookup_plugin('shell_command') shell_command = self.server.lookup_plugin('shell_command')
@ -342,6 +347,21 @@ class GitUpdater:
async def _update_virtualenv(self, rebuild_env=False): async def _update_virtualenv(self, rebuild_env=False):
# Update python dependencies # Update python dependencies
bin_dir = os.path.dirname(self.env) bin_dir = os.path.dirname(self.env)
if rebuild_env:
env_path = os.path.normpath(os.path.join(bin_dir, ".."))
env_args = REPO_DATA[self.name]['venv_args']
self._notify_status(f"Creating virtualenv at: {env_path}...")
if os.path.exists(env_path):
shutil.rmtree(env_path)
try:
await self.execute_cmd(
f"virtualenv {env_args} {env_path}")
except Exception:
self._log_exc(f"Error creating virtualenv")
return
await tornado.gen.sleep(.5)
if not os.path.expanduser(self.env):
raise self._log_exc("Failed to create new virtualenv", False)
reqs = os.path.join( reqs = os.path.join(
self.repo_path, REPO_DATA[self.name]['requirements']) self.repo_path, REPO_DATA[self.name]['requirements'])
if not os.path.isfile(reqs): if not os.path.isfile(reqs):
@ -351,7 +371,8 @@ class GitUpdater:
self._notify_status("Updating python packages...") self._notify_status("Updating python packages...")
try: try:
await self.execute_cmd( await self.execute_cmd(
f"{pip} install -r {reqs}", timeout=1200., notify=True) f"{pip} install -r {reqs}", timeout=1200., notify=True,
retries=3)
except Exception: except Exception:
self._log_exc("Error updating python requirements") self._log_exc("Error updating python requirements")