From 3faec65c8404996d955ec4cce9e9346266a71433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Wed, 27 Jul 2022 00:11:25 +0200 Subject: [PATCH 01/13] fix target osx --- buildozer/__init__.py | 3 ++ buildozer/targets/osx.py | 59 ++++++++++++++++++++++++++-------------- 2 files changed, 41 insertions(+), 21 deletions(-) diff --git a/buildozer/__init__.py b/buildozer/__init__.py index 6fbc54511..ed73a369d 100644 --- a/buildozer/__init__.py +++ b/buildozer/__init__.py @@ -513,6 +513,9 @@ def check_application_requirements(self): self.state['cache.applibs'] = requirements def _install_application_requirement(self, module): + if 'osx' in '{}'.format(self.target): + return + self._ensure_virtualenv() self.debug('Install requirement {} in virtualenv'.format(module)) self.cmd( diff --git a/buildozer/targets/osx.py b/buildozer/targets/osx.py index 6fd5d226d..17e7bce16 100644 --- a/buildozer/targets/osx.py +++ b/buildozer/targets/osx.py @@ -3,6 +3,7 @@ ''' import sys + if sys.platform != 'darwin': raise NotImplementedError('This will only work on osx') @@ -19,7 +20,7 @@ def ensure_sdk(self): if exists( join(self.buildozer.platform_dir, 'kivy-sdk-packager-master')): self.buildozer.info( - 'kivy-sdk-packager found at ' + 'kivy-sdk-packager found at ' '{}'.format(self.buildozer.platform_dir)) return @@ -27,7 +28,7 @@ def ensure_sdk(self): platdir = self.buildozer.platform_dir check_call( ('curl', '-O', '-L', - 'https://github.com/kivy/kivy-sdk-packager/archive/master.zip'), + 'https://github.com/kivy/kivy-sdk-packager/archive/master.zip'), cwd=platdir) check_call(('unzip', 'master.zip'), cwd=platdir) check_call(('rm', 'master.zip'), cwd=platdir) @@ -39,15 +40,15 @@ def download_kivy(self, cwd, py_branch=2): self.buildozer.info('Kivy found in Applications dir...') check_call( ('cp', '-a', '/Applications/Kivy{}.app'.format(py_branch), - 'Kivy.app'), cwd=cwd) + 'Kivy.app'), cwd=cwd) else: if not exists(join(cwd, 'Kivy{}.dmg'.format(py_branch))): self.buildozer.info('Downloading kivy...') status_code = check_output( ('curl', '-L', '--write-out', '%{http_code}', '-o', 'Kivy{}.dmg'.format(py_branch), - 'https://kivy.org/downloads/{}/Kivy-{}-osx-python{}.dmg' - .format(current_kivy_vers, current_kivy_vers, py_branch)), + 'https://kivy.org/downloads/{}/Kivy.dmg' # -{}-osx-python{}.dmg' + .format(current_kivy_vers)), # , current_kivy_vers, py_branch)), cwd=cwd) if status_code == "404": @@ -85,12 +86,25 @@ def check_configuration_tokens(self, errors=None): self.buildozer.info('Check target configuration tokens') self.buildozer.error( '{0} error(s) found in the buildozer.spec'.format( - len(errors))) + len(errors))) for error in errors: print(error) sys.exit(1) # check + def _install_application_requirement(self, module): + self.buildozer._ensure_virtualenv() + if 'osx' in '{}'.format(self.buildozer.target): + if 'kivy' in '{}'.format(module) or 'buildozer' in '{}'.format(module): + self.buildozer.debug('Install requirement {} in virtualenv ignored for target: osx'.format(module)) + return + + self.buildozer.debug('Install requirement {} in virtualenv'.format(module)) + cwd = join(self.buildozer.platform_dir, 'kivy-sdk-packager-master', 'osx') + self.buildozer.cmd(['Kivy.app/Contents/Resources/script', '-m', 'pip', 'install', '--upgrade', 'pip'], cwd=cwd) + self.buildozer.cmd(['Kivy.app/Contents/Resources/script', '-m', 'pip', 'install', '--upgrade', '--force-reinstall', '--target={}/_applibs'.format(self.buildozer.app_dir), '{}'.format(module)], + cwd=cwd) + def build_package(self): self.buildozer.info('Building package') @@ -99,31 +113,34 @@ def build_package(self): package_name = bcg('app', 'package.name') domain = bcg('app', 'package.domain') title = bcg('app', 'title') - app_deps = open('requirements.txt').read() + source = bcg('app', 'source.dir') + app_deps = None + if exists('{}/requirements.txt'.format(source)): + app_deps = open('{}/requirements.txt'.format(self.buildozer.app_dir)).read() + # remove # from app_deps + app_deps = [a for a in app_deps.split('\n') if not a.startswith('#')] icon = bc.getdefault('app', 'icon.filename', '') + if source in icon: + icon = '{}'.format(icon).replace('{}'.format(source), '{}'.format(self.buildozer.app_dir)) version = self.buildozer.get_version() author = bc.getdefault('app', 'author', '') self.buildozer.info('Create {}.app'.format(package_name)) + self.buildozer.mkdir('{}/_applibs'.format(self.buildozer.app_dir)) cwd = join(self.buildozer.platform_dir, 'kivy-sdk-packager-master', 'osx') - # remove kivy from app_deps - app_deps = [a for a in app_deps.split('\n') if not a.startswith('#') and a not in ['kivy', '']] - cmd = [ - 'Kivy.app/Contents/Resources/script', - '-m', 'pip', 'install', - ] - cmd.extend(app_deps) - check_output(cmd, cwd=cwd) + if app_deps is not None: + for dep in app_deps: + self._install_application_requirement(dep.replace('>', '=')) cmd = [ 'python', 'package_app.py', self.buildozer.app_dir, '--appname={}'.format(package_name), - '--bundlename={}'.format(title), - '--bundleid={}'.format(domain), - '--bundleversion={}'.format(version), - '--displayname={}'.format(title) - ] + '--bundlename={}'.format(title), + '--bundleid={}'.format(domain), + '--bundleversion={}'.format(version), + '--displayname={}'.format(title) + ] if icon: cmd.append('--icon={}'.format(icon)) if author: @@ -134,7 +151,7 @@ def build_package(self): self.buildozer.info('{}.app created.'.format(package_name)) self.buildozer.info('Creating {}.dmg'.format(package_name)) check_output( - ('sh', '-x', 'create-osx-dmg.sh', package_name + '.app'), + ('sh', '-x', 'create-osx-dmg.sh', package_name + '.app', package_name), cwd=cwd) self.buildozer.info('{}.dmg created'.format(package_name)) self.buildozer.info('moving {}.dmg to bin.'.format(package_name)) From b9ca5f7dfd2bdb753d72cd13654caca4b0571be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Wed, 27 Jul 2022 14:59:07 +0200 Subject: [PATCH 02/13] uses . because * get err file not found --- buildozer/target.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildozer/target.py b/buildozer/target.py index df09485b3..d94e98ca3 100644 --- a/buildozer/target.py +++ b/buildozer/target.py @@ -251,12 +251,12 @@ def install_or_update_repo(self, repo, **kwargs): if not self.buildozer.file_exists(install_dir): if custom_dir: cmd(["mkdir", "-p", install_dir]) - cmd(["cp", "-a", f"{custom_dir}/*", f"{install_dir}/"]) + cmd(["cp", "-a", f"{custom_dir}/.", f"{install_dir}/"]) else: cmd(["git", "clone", "--branch", clone_branch, clone_url], cwd=self.buildozer.platform_dir) elif self.platform_update: if custom_dir: - cmd(["cp", "-a", f"{custom_dir}/*", f"{install_dir}/"]) + cmd(["cp", "-a", f"{custom_dir}/.", f"{install_dir}/"]) else: cmd(["git", "clean", "-dxf"], cwd=install_dir) cmd(["git", "pull", "origin", clone_branch], cwd=install_dir) From e4aaea585e48b935b02b0f0ba7b69e4d72855dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Wed, 27 Jul 2022 17:57:01 +0200 Subject: [PATCH 03/13] fix ios creating IPA --- buildozer/targets/ios.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/buildozer/targets/ios.py b/buildozer/targets/ios.py index 245f0ccc0..93fcd6a7b 100644 --- a/buildozer/targets/ios.py +++ b/buildozer/targets/ios.py @@ -299,9 +299,12 @@ def build_package(self): self.buildozer.info('Creating IPA...') self.xcodebuild( '-exportArchive', - f'-archivePath "{xcarchive}"', - f'-exportOptionsPlist "{plist_rfn}"', - f'-exportPath "{ipa_tmp}"', + '-archivePath', + xcarchive, + '-exportOptionsPlist', + plist_rfn, + '-exportPath', + ipa_tmp, f'CODE_SIGN_IDENTITY={ioscodesign}', 'ENABLE_BITCODE=NO', cwd=build_dir) From fab88b53128be7fbeb5824365dcc3bddf0bbe548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Wed, 27 Jul 2022 19:46:05 +0200 Subject: [PATCH 04/13] fix clean out dir before move, fix icon app --- buildozer/targets/ios.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/buildozer/targets/ios.py b/buildozer/targets/ios.py index 93fcd6a7b..793a5cc87 100644 --- a/buildozer/targets/ios.py +++ b/buildozer/targets/ios.py @@ -8,6 +8,7 @@ from buildozer.target import Target, no_config from os.path import join, basename, expanduser, realpath from getpass import getpass +from PIL import Image PHP_TEMPLATE = ''' @@ -310,6 +311,8 @@ def build_package(self): cwd=build_dir) self.buildozer.info('Moving IPA to bin...') + # clean out dir + self.buildozer.rmdir(ipa) self.buildozer.file_rename(ipa_tmp, ipa) self.buildozer.info('iOS packaging done!') @@ -363,7 +366,14 @@ def _create_icons(self): icon = self.buildozer.config.getdefault('app', 'icon.filename', '') if not icon: return - icon_fn = join(self.buildozer.app_dir, icon) + # get icon size and make it for god for not get err + img = Image.open(icon) + if img.height != 72 or img.width != 72: + self.buildozer.debug('Icon size as bad format try to make a new format: {}/{} to 72/72.'.format(img.height, img.width)) + size = 72, 72 + img = img.resize(size, Image.ANTIALIAS) + img.save(join(self.app_project_dir, 'icon.png'), "PNG") + icon_fn = join(self.app_project_dir, 'icon.png') if not self.buildozer.file_exists(icon_fn): self.buildozer.error('Icon {} does not exists'.format(icon_fn)) return From 2e871216265dd4a373702a3d80f4a9742e6c43f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Wed, 27 Jul 2022 20:27:47 +0200 Subject: [PATCH 05/13] better as conditional for get if is png, or if icone is fine --- buildozer/targets/ios.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/buildozer/targets/ios.py b/buildozer/targets/ios.py index 793a5cc87..3dc38643f 100644 --- a/buildozer/targets/ios.py +++ b/buildozer/targets/ios.py @@ -366,13 +366,17 @@ def _create_icons(self): icon = self.buildozer.config.getdefault('app', 'icon.filename', '') if not icon: return + # get icon size and make it for god for not get err img = Image.open(icon) - if img.height != 72 or img.width != 72: + if img.height != 72 or img.width != 72 or not str(icon).endswith('.png'): self.buildozer.debug('Icon size as bad format try to make a new format: {}/{} to 72/72.'.format(img.height, img.width)) size = 72, 72 img = img.resize(size, Image.ANTIALIAS) img.save(join(self.app_project_dir, 'icon.png'), "PNG") + else: + self.buildozer.cmd(['cp', icon, f'{self.app_project_dir}/icon.png']) + icon_fn = join(self.app_project_dir, 'icon.png') if not self.buildozer.file_exists(icon_fn): self.buildozer.error('Icon {} does not exists'.format(icon_fn)) From 7748a907f50d78098e6a7b5daa96c843fb35063f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Wed, 27 Jul 2022 20:41:30 +0200 Subject: [PATCH 06/13] according conditional (if user ignore patern txt) --- buildozer/targets/osx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildozer/targets/osx.py b/buildozer/targets/osx.py index 17e7bce16..cbfb1fb39 100644 --- a/buildozer/targets/osx.py +++ b/buildozer/targets/osx.py @@ -116,7 +116,7 @@ def build_package(self): source = bcg('app', 'source.dir') app_deps = None if exists('{}/requirements.txt'.format(source)): - app_deps = open('{}/requirements.txt'.format(self.buildozer.app_dir)).read() + app_deps = open('{}/requirements.txt'.format(source)).read() # remove # from app_deps app_deps = [a for a in app_deps.split('\n') if not a.startswith('#')] icon = bc.getdefault('app', 'icon.filename', '') From 7bdad8a117d180953fc392e343647d7d282a04c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Wed, 27 Jul 2022 22:39:24 +0200 Subject: [PATCH 07/13] according commands from base --- buildozer/targets/osx.py | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/buildozer/targets/osx.py b/buildozer/targets/osx.py index cbfb1fb39..500f2f505 100644 --- a/buildozer/targets/osx.py +++ b/buildozer/targets/osx.py @@ -9,7 +9,6 @@ from buildozer.target import Target from os.path import exists, join, abspath, dirname -from subprocess import check_call, check_output class TargetOSX(Target): @@ -26,41 +25,41 @@ def ensure_sdk(self): self.buildozer.info('kivy-sdk-packager does not exist, clone it') platdir = self.buildozer.platform_dir - check_call( - ('curl', '-O', '-L', - 'https://github.com/kivy/kivy-sdk-packager/archive/master.zip'), + self.buildozer.cmd( + ['curl', '-O', '-L', + 'https://github.com/kivy/kivy-sdk-packager/archive/master.zip'], cwd=platdir) - check_call(('unzip', 'master.zip'), cwd=platdir) - check_call(('rm', 'master.zip'), cwd=platdir) + self.buildozer.cmd(['unzip', 'master.zip'], cwd=platdir) + self.buildozer.cmd(['rm', 'master.zip'], cwd=platdir) def download_kivy(self, cwd, py_branch=2): current_kivy_vers = self.buildozer.config.get('app', 'osx.kivy_version') if exists('/Applications/Kivy{}.app'.format(py_branch)): self.buildozer.info('Kivy found in Applications dir...') - check_call( - ('cp', '-a', '/Applications/Kivy{}.app'.format(py_branch), - 'Kivy.app'), cwd=cwd) + self.buildozer.cmd( + ['cp', '-a', '/Applications/Kivy{}.app'.format(py_branch), + 'Kivy.app'], cwd=cwd) else: if not exists(join(cwd, 'Kivy{}.dmg'.format(py_branch))): self.buildozer.info('Downloading kivy...') - status_code = check_output( - ('curl', '-L', '--write-out', '%{http_code}', '-o', 'Kivy{}.dmg'.format(py_branch), + status_code = self.buildozer.cmd( + ['curl', '-L', '--write-out', '%{http_code}', '-o', 'Kivy{}.dmg'.format(py_branch), 'https://kivy.org/downloads/{}/Kivy.dmg' # -{}-osx-python{}.dmg' - .format(current_kivy_vers)), # , current_kivy_vers, py_branch)), + .format(current_kivy_vers)], # , current_kivy_vers, py_branch)), cwd=cwd) if status_code == "404": self.buildozer.error( "Unable to download the Kivy App. Check osx.kivy_version in your buildozer.spec, and verify " "Kivy servers are accessible. https://kivy.org/downloads/") - check_call(("rm", "Kivy{}.dmg".format(py_branch)), cwd=cwd) + self.buildozer.cmd(["rm", "Kivy{}.dmg".format(py_branch)], cwd=cwd) sys.exit(1) self.buildozer.info('Extracting and installing Kivy...') - check_call(('hdiutil', 'attach', cwd + '/Kivy{}.dmg'.format(py_branch))) - check_call(('cp', '-a', '/Volumes/Kivy/Kivy.app', './Kivy.app'), cwd=cwd) + self.buildozer.cmd(['hdiutil', 'attach', cwd + '/Kivy{}.dmg'.format(py_branch)]) + self.buildozer.cmd(['cp', '-a', '/Volumes/Kivy/Kivy.app', './Kivy.app'], cwd=cwd) def ensure_kivyapp(self): self.buildozer.info('check if Kivy.app exists in local dir') @@ -146,20 +145,20 @@ def build_package(self): if author: cmd.append('--author={}'.format(author)) - check_output(cmd, cwd=cwd) + self.buildozer.cmd(cmd, cwd=cwd) self.buildozer.info('{}.app created.'.format(package_name)) self.buildozer.info('Creating {}.dmg'.format(package_name)) - check_output( - ('sh', '-x', 'create-osx-dmg.sh', package_name + '.app', package_name), + self.buildozer.cmd( + ['sh', '-x', 'create-osx-dmg.sh', package_name + '.app', package_name], cwd=cwd) self.buildozer.info('{}.dmg created'.format(package_name)) self.buildozer.info('moving {}.dmg to bin.'.format(package_name)) binpath = join( self.buildozer.user_build_dir or dirname(abspath(self.buildozer.specfilename)), 'bin') - check_output( - ('cp', '-a', package_name + '.dmg', binpath), + self.buildozer.cmd( + ['cp', '-a', package_name + '.dmg', binpath], cwd=cwd) self.buildozer.info('All Done!') From 2dece14124b01e7791058bcf30f927144e2f7ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Thu, 28 Jul 2022 02:01:24 +0200 Subject: [PATCH 08/13] # ignore --upgrade pip --- buildozer/targets/osx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildozer/targets/osx.py b/buildozer/targets/osx.py index 500f2f505..fc82f63a6 100644 --- a/buildozer/targets/osx.py +++ b/buildozer/targets/osx.py @@ -100,7 +100,7 @@ def _install_application_requirement(self, module): self.buildozer.debug('Install requirement {} in virtualenv'.format(module)) cwd = join(self.buildozer.platform_dir, 'kivy-sdk-packager-master', 'osx') - self.buildozer.cmd(['Kivy.app/Contents/Resources/script', '-m', 'pip', 'install', '--upgrade', 'pip'], cwd=cwd) + # self.buildozer.cmd(['Kivy.app/Contents/Resources/script', '-m', 'pip', 'install', '--upgrade', 'pip'], cwd=cwd) self.buildozer.cmd(['Kivy.app/Contents/Resources/script', '-m', 'pip', 'install', '--upgrade', '--force-reinstall', '--target={}/_applibs'.format(self.buildozer.app_dir), '{}'.format(module)], cwd=cwd) From 9d0eaecfa17a045283288d0fb479c8577136bcdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Thu, 28 Jul 2022 22:08:57 +0200 Subject: [PATCH 09/13] fix shell > out file uses min recomended --- buildozer/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildozer/__init__.py b/buildozer/__init__.py index ed73a369d..5272378e9 100644 --- a/buildozer/__init__.py +++ b/buildozer/__init__.py @@ -516,8 +516,9 @@ def _install_application_requirement(self, module): if 'osx' in '{}'.format(self.target): return + module = str(module).replace('>', '=') self._ensure_virtualenv() - self.debug('Install requirement {} in virtualenv'.format(module)) + self.debug(f'Install requirement {module} in virtualenv') self.cmd( ["pip", "install", f"--target={self.applibs_dir}", module], env=self.env_venv, From 5c7fc1a68ff4e70a549d1ad9a92a379585a67516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Fri, 29 Jul 2022 15:33:50 +0200 Subject: [PATCH 10/13] add osx description --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 64bf4f4cd..5f5c671ef 100644 --- a/README.md +++ b/README.md @@ -107,6 +107,7 @@ Usage: Available targets: android Android target, based on python-for-android project ios iOS target, based on kivy-ios project + osx MacOs X target, based on kivy-sdk-packager project Global commands (without target): distclean Clean the whole Buildozer environment From 67e15eba5eff79ec710972c436db79def701e763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Wed, 17 Aug 2022 22:19:16 +0200 Subject: [PATCH 11/13] comment of pip functionalities as other targets not osx, remove conditional 'if' of same target --- buildozer/__init__.py | 6 ++++-- buildozer/targets/osx.py | 8 +++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/buildozer/__init__.py b/buildozer/__init__.py index 5272378e9..558cb03f4 100644 --- a/buildozer/__init__.py +++ b/buildozer/__init__.py @@ -513,10 +513,12 @@ def check_application_requirements(self): self.state['cache.applibs'] = requirements def _install_application_requirement(self, module): - if 'osx' in '{}'.format(self.target): + # ignore *.spec requirements for osx target, uses requirements.txt section of target + if 'osx' in f'{self.target}': return - module = str(module).replace('>', '=') + # if you get obsulete files style =x.x.x maybe need uncomment next line + # module = str(module).replace('>', '=') self._ensure_virtualenv() self.debug(f'Install requirement {module} in virtualenv') self.cmd( diff --git a/buildozer/targets/osx.py b/buildozer/targets/osx.py index fc82f63a6..ec6f2dc71 100644 --- a/buildozer/targets/osx.py +++ b/buildozer/targets/osx.py @@ -93,14 +93,12 @@ def check_configuration_tokens(self, errors=None): def _install_application_requirement(self, module): self.buildozer._ensure_virtualenv() - if 'osx' in '{}'.format(self.buildozer.target): - if 'kivy' in '{}'.format(module) or 'buildozer' in '{}'.format(module): - self.buildozer.debug('Install requirement {} in virtualenv ignored for target: osx'.format(module)) - return + if 'kivy' in '{}'.format(module) or 'buildozer' in '{}'.format(module): + self.buildozer.debug('Install requirement {} in virtualenv ignored for target: osx'.format(module)) + return self.buildozer.debug('Install requirement {} in virtualenv'.format(module)) cwd = join(self.buildozer.platform_dir, 'kivy-sdk-packager-master', 'osx') - # self.buildozer.cmd(['Kivy.app/Contents/Resources/script', '-m', 'pip', 'install', '--upgrade', 'pip'], cwd=cwd) self.buildozer.cmd(['Kivy.app/Contents/Resources/script', '-m', 'pip', 'install', '--upgrade', '--force-reinstall', '--target={}/_applibs'.format(self.buildozer.app_dir), '{}'.format(module)], cwd=cwd) From e6409fa41e476a721f5817eb72bf87170b26e7b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Wed, 17 Aug 2022 22:24:25 +0200 Subject: [PATCH 12/13] small typo --- buildozer/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildozer/__init__.py b/buildozer/__init__.py index 558cb03f4..9562abd34 100644 --- a/buildozer/__init__.py +++ b/buildozer/__init__.py @@ -517,7 +517,7 @@ def _install_application_requirement(self, module): if 'osx' in f'{self.target}': return - # if you get obsulete files style =x.x.x maybe need uncomment next line + # if you get obsolete files style =x.x.x maybe need uncomment next line # module = str(module).replace('>', '=') self._ensure_virtualenv() self.debug(f'Install requirement {module} in virtualenv') From 6af98be64011ba903f61bf307f7fad49b2cc32db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Tue, 30 Aug 2022 13:59:22 +0200 Subject: [PATCH 13/13] add pillow missed dep --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 01c295649..d5d8cb5ed 100644 --- a/setup.py +++ b/setup.py @@ -64,7 +64,7 @@ def find_version(*file_paths): ], package_data={'buildozer': ['default.spec']}, include_package_data=True, - install_requires=['pexpect', 'virtualenv', 'sh'], + install_requires=['pexpect', 'virtualenv', 'sh', 'pillow'], classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers',