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

Merge pull request #3055 from PySimpleGUI/Dev-latest 

Fix in GitHub upgrade code. Only deletes repositories with "-" at end…
This commit is contained in:
PySimpleGUI 2020-06-24 06:59:06 -04:00 committed by GitHub
parent 43ecf1fa37 9c0cbd4360
commit ec3f21e141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
PySimpleGUI.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.20.0.10 Unreleased\n Ability to add your own theme easier using theme_add_new, VSeparator added (spelling error), removed Radio update clearing all if one is cleared (forgot about reset_group), new Element.set_vscroll_position method, added initial_folder to popup_get_folder and default_path to no_window version of popup_get_file, HorizontalSeparator (FINALLY), added keys to separators, added color parameter to Separators (defaults to theme text color), docstring for Window.get_screen_size, added default key for one_line_progress_meter, auto-add keys to tables & trees" version = __version__ = "4.20.0.11 Unreleased\n Ability to add your own theme easier using theme_add_new, VSeparator added (spelling error), removed Radio update clearing all if one is cleared (forgot about reset_group), new Element.set_vscroll_position method, added initial_folder to popup_get_folder and default_path to no_window version of popup_get_file, HorizontalSeparator (FINALLY), added keys to separators, added color parameter to Separators (defaults to theme text color), docstring for Window.get_screen_size, added default key for one_line_progress_meter, auto-add keys to tables & trees, update of GitHub install code (thanks Ruud)"
port = 'PySimpleGUI' port = 'PySimpleGUI'
@ -15646,10 +15646,13 @@ def _install(files, url=None):
Version history Version history
--------------- ---------------
version 1.0.5 2020-06-24
Bug with removing the dist-info of packages starting with the same name fixed.
version 1.0.4 2020-03-29 version 1.0.4 2020-03-29
Linux and ios versions now search in sys.path for site-packages, Linux and ios versions now search in sys.path for site-packages,
wheras other platforms now use site.getsitepackages(). whereas other platforms now use site.getsitepackages().
This is to aavoid installation in a roaming directory on Windows. This is to avoid installation in a roaming directory on Windows.
version 1.0.2 2020-03-07 version 1.0.2 2020-03-07
modified several open calls to be compatible with Python < 3.6 modified several open calls to be compatible with Python < 3.6
@ -15727,7 +15730,7 @@ def _install(files, url=None):
file_contents[file] = ("from ." + package + " import *\n").encode() file_contents[file] = ("from ." + package + " import *\n").encode()
if version != "unknown": if version != "unknown":
file_contents[file] += ("from ." + package + " import __version__\n").encode() file_contents[file] += ("from ." + package + " import __version__\n").encode()
if sys.platform.startswith('linux') or (sys.platform == 'ios'): if sys.platform.startswith("linux") or (sys.platform == "ios"):
search_in = sys.path search_in = sys.path
else: else:
search_in = site.getsitepackages() search_in = site.getsitepackages()
@ -15767,7 +15770,7 @@ def _install(files, url=None):
else: else:
for entry in sitepackages_path.glob("*"): for entry in sitepackages_path.glob("*"):
if entry.is_dir(): if entry.is_dir():
if entry.stem.startswith(package) and entry.suffix == ".dist-info": if entry.stem.startswith(package + "-") and entry.suffix == ".dist-info":
shutil.rmtree(entry) shutil.rmtree(entry)
path_distinfo = Path(str(path) + "-" + version + ".dist-info") path_distinfo = Path(str(path) + "-" + version + ".dist-info")
if not path_distinfo.is_dir(): if not path_distinfo.is_dir():
@ -15812,18 +15815,11 @@ def _upgrade_from_github():
info = _install( info = _install(
files="PySimpleGUI.py !init.py".split(), url="https://raw.githubusercontent.com/PySimpleGUI/PySimpleGUI/master/" files="PySimpleGUI.py !init.py".split(), url="https://raw.githubusercontent.com/PySimpleGUI/PySimpleGUI/master/"
) )
"""
info = install(
files="salabim.py !calibri.ttf !mplus-1m-regular.ttf !license.txt !DejaVuSansMono.ttf !changelog.txt".split(),
url="https://raw.githubusercontent.com/salabim/salabim/master/",
)
"""
# print(info.package + " " + info.version + " successfully installed in " + info.path) # print(info.package + " " + info.version + " successfully installed in " + info.path)
# print("files copied: ", info.files_copied) # print("files copied: ", ", ".join(info.files_copied))
popup("*** SUCCESS ***", info.package, info.version, "successfully installed in ", info.path, "files copied: ", info.files_copied,
keep_on_top=True, background_color='red', text_color='white') popup("*** SUCCESS ***", info.package, info.version, "successfully installed in ", info.path, "files copied: ", info.files_copied, keep_on_top=True, background_color='red', text_color='white')
def _upgrade_gui(): def _upgrade_gui():