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

Applied review remarks

Browse Source
This commit is contained in:
Sławomir Zborowski
2024-05-07 13:15:56 +02:00
parent 77ae6c7d55
commit a6d0da5f0b
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
python_appimage/__main__.py
View File

@@ -7,6 +7,11 @@ import sys
__all__ = ['main']
def directory(path):
if not os.path.isdir(path):
raise argparse.ArgumentTypeError("Not a directory: {}".format(path))
return os.path.abspath(path)
def main():
'''Entry point for the CLI
'''
@@ -73,6 +78,8 @@ def main():
help='force pip in-tree-build',
action='store_true',
default=False)
build_app_parser.add_argument('-x', '--extra-files', type=directory,
help='path to directory containing extra files to be baked in')
list_parser = subparsers.add_parser('list',
description='List Python versions installed in a manylinux image')

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

@@ -26,14 +26,14 @@ def _unpack_args(args):
'''Unpack command line arguments
'''
return args.appdir, args.name, args.python_version, args.linux_tag, \
args.python_tag, args.base_image, args.in_tree_build
args.python_tag, args.base_image, args.in_tree_build, args.extra_files
_tag_pattern = re.compile('python([^-]+)[-]([^.]+)[.]AppImage')
_linux_pattern = re.compile('manylinux([0-9]+)_' + platform.machine())
def execute(appdir, name=None, python_version=None, linux_tag=None,
python_tag=None, base_image=None, in_tree_build=False):
python_tag=None, base_image=None, in_tree_build=False, extra_files=None):
'''Build a Python application using a base AppImage
'''
@@ -288,11 +288,9 @@ def execute(appdir, name=None, python_version=None, linux_tag=None,
exclude=(deprecation + git_warnings))
# Bundle auxilliary application files
aux_files_path = glob.glob(appdir + '/files')
if aux_files_path:
aux_files_path = aux_files_path[0]
log('BUNDLE', os.path.basename(aux_files_path))
copy_tree(aux_files_path, 'AppDir/')
if extra_files is not None:
log('BUNDLE', os.path.basename(extra_files))
copy_tree(extra_files, 'AppDir/')
# Bundle the entry point
entrypoint_path = glob.glob(appdir + '/entrypoint.*')