mlaga97
/
PySimpleGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4938 from PySimpleGUI/Dev-latest 

Change from pythonw to python in the upgrade from github code for the…
This commit is contained in:
PySimpleGUI 2021-11-07 05:10:01 -05:00 committed by GitHub
parent 416d26ce9f 65eebb1b07
commit f48b8c77c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PySimpleGUI.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.54.0.2 Unreleased" version = __version__ = "4.54.0.3 Unreleased"
_change_log = """ _change_log = """
Changelog since 4.54.0 released to PyPI on 6-Nov-2021 Changelog since 4.54.0 released to PyPI on 6-Nov-2021
@ -8,7 +8,8 @@ _change_log = """
Changed the Exec start subprocess/ run py file to use the sys.executable Changed the Exec start subprocess/ run py file to use the sys.executable
4.54.0.2 4.54.0.2
Change from pythonw to python if the main or upgrade sys.executable found to be pythonw. This seems to be the difference when psgupgrade fails. Change from pythonw to python if the main or upgrade sys.executable found to be pythonw. This seems to be the difference when psgupgrade fails.
4.54.0.3
Also change from pythonw to python in the github upgrade call to pip
""" """
__version__ = version.split()[0] # For PEP 396 and PEP 345 __version__ = version.split()[0] # For PEP 396 and PEP 345
@ -22198,6 +22199,8 @@ def _copy_files_from_github():
# subprocess.check_call([sys.executable, '-m', 'pip', 'install', path]) # subprocess.check_call([sys.executable, '-m', 'pip', 'install', path])
# python_command = execute_py_get_interpreter() # python_command = execute_py_get_interpreter()
python_command = sys.executable # always use the currently running interpreter to perform the pip! python_command = sys.executable # always use the currently running interpreter to perform the pip!
if 'pythonw' in python_command:
python_command = python_command.replace('pythonw', 'python')
layout = [[Text('Pip Upgrade Progress')], layout = [[Text('Pip Upgrade Progress')],
[Multiline(s=(90,30), k='-MLINE-', reroute_cprint=True, write_only=True)], [Multiline(s=(90,30), k='-MLINE-', reroute_cprint=True, write_only=True)],
@ -22205,6 +22208,7 @@ def _copy_files_from_github():
window = Window('Pip Upgrade', layout, finalize=True, keep_on_top=True, modal=True, disable_close=True) window = Window('Pip Upgrade', layout, finalize=True, keep_on_top=True, modal=True, disable_close=True)
cprint('The value of sys.executable = ', sys.executable, c='white on red') cprint('The value of sys.executable = ', sys.executable, c='white on red')
# if not python_command: # if not python_command:
@ -22275,7 +22279,7 @@ def _upgrade_entry_point():
""" """
interpreter = sys.executable interpreter = sys.executable
if 'pythonw' in interpreter: if 'pythonw' in interpreter:
interpreter.replace('pythonw', 'python') interpreter = interpreter.replace('pythonw', 'python')
execute_py_file(__file__, 'upgrade', interpreter_command=interpreter) execute_py_file(__file__, 'upgrade', interpreter_command=interpreter)
@ -22285,7 +22289,7 @@ def _main_entry_point():
# Relaunch using the same python interpreter that was used to run this function # Relaunch using the same python interpreter that was used to run this function
interpreter = sys.executable interpreter = sys.executable
if 'pythonw' in interpreter: if 'pythonw' in interpreter:
interpreter.replace('pythonw', 'python') interpreter = interpreter.replace('pythonw', 'python')
execute_py_file(__file__, interpreter_command=interpreter) execute_py_file(__file__, interpreter_command=interpreter)
main_upgrade_from_github = _upgrade_entry_point main_upgrade_from_github = _upgrade_entry_point