Merge branch 'DoorDev' into Synthesis

# Conflicts:
#	Main.py
#	README.md
#	RELEASENOTES.md
This commit is contained in:
aerinon
2022-10-27 15:22:44 -06:00
10 changed files with 304 additions and 300 deletions

View File

@@ -6,7 +6,7 @@ import subprocess # do stuff at the shell level
env = common.prepare_env()
pip_requirements = os.path.join("..","resources","app","meta","manifests","pip_requirements.txt")
pip_requirements = os.path.join(".","resources","app","meta","manifests","pip_requirements.txt")
if not os.path.isfile(pip_requirements):
pip_requirements = os.path.join("..","..","..","resources","app","meta","manifests","pip_requirements.txt")