Lerking/python-appimage
1
0
Fork 0
mirror of https://github.com/niess/python-appimage.git synced 2026-03-14 12:20:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added support for git dependencies with custom branch name.

Browse Source
This commit is contained in:
Sławomir Zborowski
2024-04-27 00:00:53 +02:00
parent af59728145
commit 955149ad6a
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python_appimage/commands/build/app.py
View File

@@ -253,6 +253,12 @@ def execute(appdir, name=None, python_version=None, linux_tag=None,
'WARNING: Running pip as'
)
git_warnings = (
re.compile(r'\s+Running command git (clone|checkout) '),
re.compile(r"\s+Branch '.*' set up to track remote"),
re.compile(r"\s+Switched to a new branch '.*'"),
)
isolation_flag = '-sE' if python_version[0] == '2' else '-I'
system(('./AppDir/AppRun', isolation_flag, '-m', 'pip', 'install', '-U', in_tree_build,
'--no-warn-script-location', 'pip'), exclude=deprecation)
@@ -279,7 +285,7 @@ def execute(appdir, name=None, python_version=None, linux_tag=None,
log('BUNDLE', requirement)
system(('./AppDir/AppRun', isolation_flag, '-m', 'pip', 'install', '-U', in_tree_build,
'--no-warn-script-location', requirement),
exclude=(deprecation, ' Running command git clone'))
exclude=(deprecation + git_warnings))
# Bundle the entry point

9
python_appimage/utils/system.py
View File

@@ -41,9 +41,16 @@ def system(args, exclude=None, stdin=None):
if err:
err = decode(err)
stripped = [line for line in err.split(os.linesep) if line]
def matches_pattern(line, pattern):
if isinstance(pattern, re.Pattern):
return bool(pattern.match(line))
return line.startswith(pattern)
for pattern in exclude:
stripped = [line for line in stripped
if not line.startswith(pattern)]
if not matches_pattern(line, pattern)]
if stripped:
# Tolerate single line warning(s)
for line in stripped: