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

update_manager: symlink dist packages on virtualenv rebuild 

This allows for the installation of python "dist-packages" without enabling "system-site-packages" in the virtualenv.  As of the moment moonraker only requires the gpiod dist package.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-12-22 17:55:59 -05:00
parent 40fbe1abf1
commit 9f9a05cabb
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
moonraker/plugins/update_manager.py
View File

@ -30,14 +30,20 @@ REPO_DATA = {
'origin': "https://github.com/arksine/moonraker.git", 'origin': "https://github.com/arksine/moonraker.git",
'install_script': "scripts/install-moonraker.sh", 'install_script': "scripts/install-moonraker.sh",
'requirements': "scripts/moonraker-requirements.txt", 'requirements': "scripts/moonraker-requirements.txt",
'venv_args': "-p python3 --system-site-packages" 'venv_args': "-p python3",
'dist_packages': ["gpiod"],
'dist_dir': "/usr/lib/python3/dist-packages",
'site_pkg_path': "lib/python3.7/site-packages",
}, },
'klipper': { 'klipper': {
'repo_url': f"{REPO_PREFIX}/kevinoconnor/klipper/branches/master", 'repo_url': f"{REPO_PREFIX}/kevinoconnor/klipper/branches/master",
'origin': "https://github.com/kevinoconnor/klipper.git", 'origin': "https://github.com/kevinoconnor/klipper.git",
'install_script': "scripts/install-octopi.sh", 'install_script': "scripts/install-octopi.sh",
'requirements': "scripts/klippy-requirements.txt", 'requirements': "scripts/klippy-requirements.txt",
'venv_args': "-p python2" 'venv_args': "-p python2",
'dist_packages': [],
'dist_dir': "",
'site_pkg_path': "",
} }
} }
@ -382,6 +388,17 @@ class GitUpdater:
return return
if not os.path.expanduser(self.env): if not os.path.expanduser(self.env):
raise self._log_exc("Failed to create new virtualenv", False) raise self._log_exc("Failed to create new virtualenv", False)
dist_pkgs = REPO_DATA[self.name]['dist_packages']
dist_dir = REPO_DATA[self.name]['dist_dir']
site_path = REPO_DATA[self.name]['site_pkg_path']
for pkg in dist_pkgs:
for f in os.listdir(dist_dir):
if f.startswith(pkg):
src = os.path.join(dist_dir, f)
dest = os.path.join(env_path, site_path, f)
self._notify_status(f"Linking to dist package: {pkg}")
os.symlink(f, dest)
break
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):

2
scripts/version.txt
View File

@ -1,2 +1,2 @@
env_version=0.2.2 env_version=0.2.4
deps_version=0.2.2 deps_version=0.2.2