accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-14 17:24:04 +00:00
Code Issues Releases Activity

fix: Check if Py3.5+ before installing distro

Browse Source
This commit is contained in:
Gavin D'souza 2020-08-14 20:29:46 +05:30
parent 78eb208abc
commit f032fc0b86
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
install.py
View File

@ -20,6 +20,7 @@ execution_time = "{:%H:%M}".format(execution_timestamp)
log_file_name = "easy-install__{0}__{1}.log".format(execution_day, execution_time.replace(':', '-')) log_file_name = "easy-install__{0}__{1}.log".format(execution_day, execution_time.replace(':', '-'))
log_path = os.path.join(tmp_log_folder, log_file_name) log_path = os.path.join(tmp_log_folder, log_file_name)
log_stream = sys.stdout log_stream = sys.stdout
distro_required = not ((sys.version_info.major < 3) or (sys.version_info.major == 3 and sys.version_info.minor < 5))
def log(message, level=0): def log(message, level=0):
@ -93,10 +94,10 @@ def check_distribution_compatibility():
else: else:
log("Sorry, the installer doesn't support {0}. Aborting installation!".format(dist_name), level=2) log("Sorry, the installer doesn't support {0}. Aborting installation!".format(dist_name), level=2)
def import_with_install(package): def import_with_install(package):
# copied from https://discuss.erpnext.com/u/nikunj_patel # copied from https://discuss.erpnext.com/u/nikunj_patel
# https://discuss.erpnext.com/t/easy-install-setup-guide-for-erpnext-installation-on-ubuntu-20-04-lts-with-some-modification-of-course/62375/5 # https://discuss.erpnext.com/t/easy-install-setup-guide-for-erpnext-installation-on-ubuntu-20-04-lts-with-some-modification-of-course/62375/5
# need to move to top said v13 for fully python3 era # need to move to top said v13 for fully python3 era
import importlib import importlib
@ -115,14 +116,11 @@ def import_with_install(package):
def get_distribution_info(): def get_distribution_info():
# return distribution name and major version # return distribution name and major version
if platform.system() == "Linux": if platform.system() == "Linux":
if sys.version_info.major == 3 and sys.version_info.minor > 7: if distro_required:
install_package('pip3', 'python3-pip')
import_with_install('distro')
current_dist = distro.linux_distribution(full_distribution_name=True) current_dist = distro.linux_distribution(full_distribution_name=True)
else: else:
current_dist = platform.dist() current_dist = platform.dist()
return current_dist[0].lower(), current_dist[1].rsplit('.')[0] return current_dist[0].lower(), current_dist[1].rsplit('.')[0]
elif platform.system() == "Darwin": elif platform.system() == "Darwin":
@ -391,6 +389,12 @@ def run_playbook(playbook_name, sudo=False, extra_vars=None):
return success return success
def setup_script_requirements():
if distro_required:
install_package('pip3', 'python3-pip')
import_with_install('distro')
def parse_commandline_args(): def parse_commandline_args():
import argparse import argparse
@ -433,6 +437,7 @@ def parse_commandline_args():
return args return args
if __name__ == '__main__': if __name__ == '__main__':
if sys.version[0] == '2': if sys.version[0] == '2':
if not os.environ.get('CI'): if not os.environ.get('CI'):
@ -459,6 +464,7 @@ if __name__ == '__main__':
with warnings.catch_warnings(): with warnings.catch_warnings():
warnings.simplefilter("ignore") warnings.simplefilter("ignore")
setup_log_stream(args) setup_log_stream(args)
setup_script_requirements()
check_distribution_compatibility() check_distribution_compatibility()
check_system_package_managers() check_system_package_managers()
check_environment() check_environment()
@ -466,4 +472,3 @@ if __name__ == '__main__':
install_bench(args) install_bench(args)
log("Bench + Frappe + ERPNext has been successfully installed!") log("Bench + Frappe + ERPNext has been successfully installed!")