Upgrade p4a #19

Open
jessopb wants to merge 36 commits from upgrade_p4a into master
Showing only changes of commit 7bde41c37f - Show all commits

View file

@ -15,15 +15,15 @@ package_data = {'': ['*.tmpl',
data_files = [] data_files = []
#
if os.name == 'nt': # if os.name == 'nt':
install_reqs = ['appdirs', 'colorama>=0.3.3', 'jinja2', # install_reqs = ['appdirs', 'colorama>=0.3.3', 'jinja2',
'six'] # 'six']
else: # else:
# don't use sh after 1.12.5, we have performance issues # don't use sh after 1.12.5, we have performance issues
# https://github.com/amoffat/sh/issues/378 # https://github.com/amoffat/sh/issues/378
install_reqs = ['appdirs', 'colorama>=0.3.3', 'sh>=1.10,<1.12.5', 'jinja2', install_reqs = ['appdirs', 'colorama>=0.3.3', 'sh>=1.10,<1.12.5', 'jinja2',
'six', 'enum34'] 'six', 'enum34']
# By specifying every file manually, package_data will be able to # By specifying every file manually, package_data will be able to
# include them in binary distributions. Note that we have to add # include them in binary distributions. Note that we have to add
@ -90,15 +90,17 @@ setup(name='python-for-android',
install_requires=install_reqs, install_requires=install_reqs,
entry_points={ entry_points={
'console_scripts': [ 'console_scripts': [
'python-for-android = pythonforandroid.toolchain:main', 'python-for-android = pythonforandroid.entrypoints:main',
'p4a = pythonforandroid.toolchain:main', 'p4a = pythonforandroid.entrypoints:main',
], ],
'distutils.commands': [ 'distutils.commands': [
'apk = pythonforandroid.bdistapk:BdistAPK', 'apk = pythonforandroid.bdistapk:BdistAPK',
], 'aar = pythonforandroid.bdistapk:BdistAAR',
}, 'aab = pythonforandroid.bdistapk:BdistAAB',
classifiers = [ ],
'Development Status :: 4 - Beta', },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers', 'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License', 'License :: OSI Approved :: MIT License',
'Operating System :: Microsoft :: Windows', 'Operating System :: Microsoft :: Windows',
@ -107,11 +109,14 @@ setup(name='python-for-android',
'Operating System :: MacOS :: MacOS X', 'Operating System :: MacOS :: MacOS X',
'Operating System :: Android', 'Operating System :: Android',
'Programming Language :: C', 'Programming Language :: C',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Topic :: Software Development', 'Topic :: Software Development',
'Topic :: Utilities', 'Topic :: Utilities',
], ],
packages=packages, packages=packages,
package_data=package_data, package_data=package_data,
) )