accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-12 00:06:36 +00:00
Code Issues Releases Activity

Merge pull request #1049 from gavindsouza/fix-py35+

Browse Source 
fix(install.py): Check if Py3.5+ before installing distro
This commit is contained in:
gavin 2020-08-14 21:44:11 +05:30 committed by GitHub
commit 11657974e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -65,8 +65,8 @@ matrix:
env: TEST=bench
script: python -m unittest -v bench.tests.test_init
- name: "Python 3.6 Easy Install"
python: 3.6
- name: "Python 3.5 Easy Install"
python: 3.5
env: TEST=easy_install
script: sudo python $TRAVIS_BUILD_DIR/install.py --user travis --run-travis --production --verbose

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_path = os.path.join(tmp_log_folder, log_file_name)
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):
@ -93,10 +94,10 @@ def check_distribution_compatibility():
else:
log("Sorry, the installer doesn't support {0}. Aborting installation!".format(dist_name), level=2)
def import_with_install(package):
# 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
# need to move to top said v13 for fully python3 era
import importlib
@ -115,14 +116,11 @@ def import_with_install(package):
def get_distribution_info():
# return distribution name and major version
if platform.system() == "Linux":
if sys.version_info.major == 3 and sys.version_info.minor > 7:
install_package('pip3', 'python3-pip')
import_with_install('distro')
if distro_required:
current_dist = distro.linux_distribution(full_distribution_name=True)
else:
current_dist = platform.dist()
return current_dist[0].lower(), current_dist[1].rsplit('.')[0]
elif platform.system() == "Darwin":
@ -391,6 +389,12 @@ def run_playbook(playbook_name, sudo=False, extra_vars=None):
return success
def setup_script_requirements():
if distro_required:
install_package('pip3', 'python3-pip')
import_with_install('distro')
def parse_commandline_args():
import argparse
@ -433,6 +437,7 @@ def parse_commandline_args():
return args
if __name__ == '__main__':
if sys.version[0] == '2':
if not os.environ.get('CI'):
@ -459,6 +464,7 @@ if __name__ == '__main__':
with warnings.catch_warnings():
warnings.simplefilter("ignore")
setup_log_stream(args)
setup_script_requirements()
check_distribution_compatibility()
check_system_package_managers()
check_environment()
@ -466,4 +472,3 @@ if __name__ == '__main__':
install_bench(args)
log("Bench + Frappe + ERPNext has been successfully installed!")