diff --git a/applications/xonsh/requirements.txt b/applications/xonsh/requirements.txt index d6148a7..7259cac 100644 --- a/applications/xonsh/requirements.txt +++ b/applications/xonsh/requirements.txt @@ -1,3 +1,3 @@ -xonsh +git+https://github.com/xonsh/xonsh prompt_toolkit Pygments diff --git a/python_appimage/commands/build/app.py b/python_appimage/commands/build/app.py index febe368..55e847b 100644 --- a/python_appimage/commands/build/app.py +++ b/python_appimage/commands/build/app.py @@ -105,11 +105,11 @@ def execute(appdir, name=None, python_version=None, linux_tag=None, with open(requirements_path) as f: for line in f: line = line.strip() - if line.startswith('#'): + if (not line) or line.startswith('#'): continue requirements_list.append(line) - requirements = sorted(requirements_list) + requirements = sorted(os.path.basename(r) for r in requirements_list) n = len(requirements) if n == 0: requirements = '' @@ -218,10 +218,14 @@ def execute(appdir, name=None, python_version=None, linux_tag=None, system(('./AppDir/AppRun', '-m', 'pip', 'install', '-U', '--no-warn-script-location', 'pip'), exclude=deprecation) for requirement in requirements_list: - log('BUNDLE', requirement) + if requirement.startswith('git+'): + url, name = os.path.split(requirement) + log('BUNDLE', name + ' from ' + url[4:]) + else: + log('BUNDLE', requirement) system(('./AppDir/AppRun', '-m', 'pip', 'install', '-U', '--no-warn-script-location', requirement), - exclude=deprecation) + exclude=(deprecation, ' Running command git clone -q')) # Bundle the entry point