From 908f43827e9f8d543266724e087f2ce2cd8dfe75 Mon Sep 17 00:00:00 2001 From: EugeniaVoytik Date: Mon, 4 Apr 2022 13:50:17 +0200 Subject: [PATCH 1/4] CHORE: update pyinstaller version --- release/one_click_linux_gui/create_installer_linux.sh | 2 +- release/one_click_macos_gui/create_installer_macos.sh | 2 +- release/one_click_windows_gui/create_installer_windows.sh | 2 +- release/pyinstaller/alphaviz_pyinstaller.py | 2 +- requirements/requirements_development.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/release/one_click_linux_gui/create_installer_linux.sh b/release/one_click_linux_gui/create_installer_linux.sh index 13f5bf2..c12bf56 100644 --- a/release/one_click_linux_gui/create_installer_linux.sh +++ b/release/one_click_linux_gui/create_installer_linux.sh @@ -20,7 +20,7 @@ cd release/one_click_linux_gui pip install "../../dist/alphaviz-1.1.8-py3-none-any.whl[stable,gui-stable]" # Creating the stand-alone pyinstaller folder -pip install pyinstaller==4.10 +pip install pyinstaller==4.2 pyinstaller ../pyinstaller/alphaviz.spec -y conda deactivate diff --git a/release/one_click_macos_gui/create_installer_macos.sh b/release/one_click_macos_gui/create_installer_macos.sh index df85040..0e8854d 100644 --- a/release/one_click_macos_gui/create_installer_macos.sh +++ b/release/one_click_macos_gui/create_installer_macos.sh @@ -23,7 +23,7 @@ cd release/one_click_macos_gui pip install "../../dist/alphaviz-1.1.8-py3-none-any.whl[stable,gui-stable]" # Creating the stand-alone pyinstaller folder -pip install pyinstaller==4.10 +pip install pyinstaller==4.2 pyinstaller ../pyinstaller/alphaviz.spec -y conda deactivate diff --git a/release/one_click_windows_gui/create_installer_windows.sh b/release/one_click_windows_gui/create_installer_windows.sh index e18a531..9761223 100644 --- a/release/one_click_windows_gui/create_installer_windows.sh +++ b/release/one_click_windows_gui/create_installer_windows.sh @@ -20,7 +20,7 @@ cd release/one_click_windows_gui pip install "../../dist/alphaviz-1.1.8-py3-none-any.whl[stable,gui-stable]" # Creating the stand-alone pyinstaller folder -pip install pyinstaller==4.10 +pip install pyinstaller==4.2 pyinstaller ../pyinstaller/alphaviz.spec -y conda deactivate diff --git a/release/pyinstaller/alphaviz_pyinstaller.py b/release/pyinstaller/alphaviz_pyinstaller.py index 88209ba..4cfc9b9 100644 --- a/release/pyinstaller/alphaviz_pyinstaller.py +++ b/release/pyinstaller/alphaviz_pyinstaller.py @@ -4,7 +4,7 @@ import multiprocessing multiprocessing.freeze_support() alphaviz.gui.run() - except e: + except: import traceback import sys exc_info = sys.exc_info() diff --git a/requirements/requirements_development.txt b/requirements/requirements_development.txt index a466f27..4e197b0 100644 --- a/requirements/requirements_development.txt +++ b/requirements/requirements_development.txt @@ -1,6 +1,6 @@ jupyter==1.0.0 jupyter_contrib_nbextensions==0.5.1 -pyinstaller==4.10 +pyinstaller==4.2 autodocsumm==0.2.6 sphinx-rtd-theme==0.5.2 twine==3.4.1 From 616ea355ad3ba7c98458d8464a1904eef6c338a9 Mon Sep 17 00:00:00 2001 From: EugeniaVoytik Date: Mon, 4 Apr 2022 14:05:55 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Bump=20version:=201.1.8=20=E2=86=92=201.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alphaviz/__init__.py | 2 +- misc/bumpversion.cfg | 2 +- release/one_click_linux_gui/control | 2 +- release/one_click_linux_gui/create_installer_linux.sh | 2 +- release/one_click_macos_gui/Info.plist | 4 ++-- release/one_click_macos_gui/create_installer_macos.sh | 4 ++-- release/one_click_macos_gui/distribution.xml | 2 +- release/one_click_windows_gui/alphaviz_innoinstaller.iss | 2 +- release/one_click_windows_gui/create_installer_windows.sh | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/alphaviz/__init__.py b/alphaviz/__init__.py index 2855820..94e158d 100644 --- a/alphaviz/__init__.py +++ b/alphaviz/__init__.py @@ -1,7 +1,7 @@ #!python __project__ = "alphaviz" -__version__ = "1.1.8" +__version__ = "1.1.9" __license__ = "Apache" __description__ = "A interactive Dashboard to explore mass spectrometry data." __author__ = "Eugenia Voytik" diff --git a/misc/bumpversion.cfg b/misc/bumpversion.cfg index 52361b8..2f00bc9 100644 --- a/misc/bumpversion.cfg +++ b/misc/bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.1.8 +current_version = 1.1.9 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? diff --git a/release/one_click_linux_gui/control b/release/one_click_linux_gui/control index 3e3c482..876c5b3 100644 --- a/release/one_click_linux_gui/control +++ b/release/one_click_linux_gui/control @@ -1,5 +1,5 @@ Package: alphaviz -Version: 1.1.8 +Version: 1.1.9 Architecture: all Maintainer: Mann Labs Description: alphaviz diff --git a/release/one_click_linux_gui/create_installer_linux.sh b/release/one_click_linux_gui/create_installer_linux.sh index c12bf56..575f370 100644 --- a/release/one_click_linux_gui/create_installer_linux.sh +++ b/release/one_click_linux_gui/create_installer_linux.sh @@ -17,7 +17,7 @@ python setup.py sdist bdist_wheel # Setting up the local package cd release/one_click_linux_gui # Make sure you include the required extra packages and always use the stable or very-stable options! -pip install "../../dist/alphaviz-1.1.8-py3-none-any.whl[stable,gui-stable]" +pip install "../../dist/alphaviz-1.1.9-py3-none-any.whl[stable,gui-stable]" # Creating the stand-alone pyinstaller folder pip install pyinstaller==4.2 diff --git a/release/one_click_macos_gui/Info.plist b/release/one_click_macos_gui/Info.plist index 2eab7ff..9d1b09b 100644 --- a/release/one_click_macos_gui/Info.plist +++ b/release/one_click_macos_gui/Info.plist @@ -9,9 +9,9 @@ CFBundleIconFile alpha_logo.icns CFBundleIdentifier - alphaviz.1.1.8 + alphaviz.1.1.9 CFBundleShortVersionString - 1.1.8 + 1.1.9 CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/release/one_click_macos_gui/create_installer_macos.sh b/release/one_click_macos_gui/create_installer_macos.sh index 0e8854d..e436ab5 100644 --- a/release/one_click_macos_gui/create_installer_macos.sh +++ b/release/one_click_macos_gui/create_installer_macos.sh @@ -20,7 +20,7 @@ python setup.py sdist bdist_wheel # Setting up the local package cd release/one_click_macos_gui -pip install "../../dist/alphaviz-1.1.8-py3-none-any.whl[stable,gui-stable]" +pip install "../../dist/alphaviz-1.1.9-py3-none-any.whl[stable,gui-stable]" # Creating the stand-alone pyinstaller folder pip install pyinstaller==4.2 @@ -40,5 +40,5 @@ cp ../../LICENSE.txt Resources/LICENSE.txt cp ../logos/alpha_logo.png Resources/alpha_logo.png chmod 777 scripts/* -pkgbuild --root dist/alphaviz --identifier de.mpg.biochem.alphaviz.app --version 1.1.8 --install-location /Applications/alphaviz.app --scripts scripts alphaviz.pkg +pkgbuild --root dist/alphaviz --identifier de.mpg.biochem.alphaviz.app --version 1.1.9 --install-location /Applications/alphaviz.app --scripts scripts alphaviz.pkg productbuild --distribution distribution.xml --resources Resources --package-path alphaviz.pkg dist/alphaviz_gui_installer_macos.pkg diff --git a/release/one_click_macos_gui/distribution.xml b/release/one_click_macos_gui/distribution.xml index b72fac7..91b43b1 100644 --- a/release/one_click_macos_gui/distribution.xml +++ b/release/one_click_macos_gui/distribution.xml @@ -1,6 +1,6 @@ - alphaviz 1.1.8 + alphaviz 1.1.9 diff --git a/release/one_click_windows_gui/alphaviz_innoinstaller.iss b/release/one_click_windows_gui/alphaviz_innoinstaller.iss index 2b208af..cdbeffc 100644 --- a/release/one_click_windows_gui/alphaviz_innoinstaller.iss +++ b/release/one_click_windows_gui/alphaviz_innoinstaller.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "alphaviz" -#define MyAppVersion "1.1.8" +#define MyAppVersion "1.1.9" #define MyAppPublisher "Max Planck Institute of Biochemistry and the University of Copenhagen, Mann Labs" #define MyAppURL "https://github.com/MannLabs/alphaviz" #define MyAppExeName "alphaviz_gui.exe" diff --git a/release/one_click_windows_gui/create_installer_windows.sh b/release/one_click_windows_gui/create_installer_windows.sh index 9761223..d25d0b0 100644 --- a/release/one_click_windows_gui/create_installer_windows.sh +++ b/release/one_click_windows_gui/create_installer_windows.sh @@ -17,7 +17,7 @@ python setup.py sdist bdist_wheel # Setting up the local package cd release/one_click_windows_gui # Make sure you include the required extra packages and always use the stable or very-stable options! -pip install "../../dist/alphaviz-1.1.8-py3-none-any.whl[stable,gui-stable]" +pip install "../../dist/alphaviz-1.1.9-py3-none-any.whl[stable,gui-stable]" # Creating the stand-alone pyinstaller folder pip install pyinstaller==4.2 From 88a06787c34b6ca10aa95ed43977a0f68001dd09 Mon Sep 17 00:00:00 2001 From: EugeniaVoytik Date: Mon, 4 Apr 2022 15:24:56 +0200 Subject: [PATCH 3/4] CHORE: update the pyinstaller to the latest version --- HISTORY.md | 2 +- release/one_click_linux_gui/create_installer_linux.sh | 2 +- release/one_click_macos_gui/create_installer_macos.sh | 2 +- release/one_click_windows_gui/create_installer_windows.sh | 2 +- requirements/requirements_development.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index b203d48..23b0531 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,6 @@ ## Changelog -### 1.1.7 +### 1.1.10 * FEAT: Enable fine-tuning of retention times for predictions. * FEAT: Add the predicted retention time and ion mobility values to the "Main tab" of the dashboard. * FIX: Correct the mass calculation for modified peptides in prediction mode. diff --git a/release/one_click_linux_gui/create_installer_linux.sh b/release/one_click_linux_gui/create_installer_linux.sh index 575f370..13e6075 100644 --- a/release/one_click_linux_gui/create_installer_linux.sh +++ b/release/one_click_linux_gui/create_installer_linux.sh @@ -20,7 +20,7 @@ cd release/one_click_linux_gui pip install "../../dist/alphaviz-1.1.9-py3-none-any.whl[stable,gui-stable]" # Creating the stand-alone pyinstaller folder -pip install pyinstaller==4.2 +pip install pyinstaller==4.10 pyinstaller ../pyinstaller/alphaviz.spec -y conda deactivate diff --git a/release/one_click_macos_gui/create_installer_macos.sh b/release/one_click_macos_gui/create_installer_macos.sh index e436ab5..232a865 100644 --- a/release/one_click_macos_gui/create_installer_macos.sh +++ b/release/one_click_macos_gui/create_installer_macos.sh @@ -23,7 +23,7 @@ cd release/one_click_macos_gui pip install "../../dist/alphaviz-1.1.9-py3-none-any.whl[stable,gui-stable]" # Creating the stand-alone pyinstaller folder -pip install pyinstaller==4.2 +pip install pyinstaller==4.10 pyinstaller ../pyinstaller/alphaviz.spec -y conda deactivate diff --git a/release/one_click_windows_gui/create_installer_windows.sh b/release/one_click_windows_gui/create_installer_windows.sh index d25d0b0..e249f95 100644 --- a/release/one_click_windows_gui/create_installer_windows.sh +++ b/release/one_click_windows_gui/create_installer_windows.sh @@ -20,7 +20,7 @@ cd release/one_click_windows_gui pip install "../../dist/alphaviz-1.1.9-py3-none-any.whl[stable,gui-stable]" # Creating the stand-alone pyinstaller folder -pip install pyinstaller==4.2 +pip install pyinstaller==4.10 pyinstaller ../pyinstaller/alphaviz.spec -y conda deactivate diff --git a/requirements/requirements_development.txt b/requirements/requirements_development.txt index 4e197b0..a466f27 100644 --- a/requirements/requirements_development.txt +++ b/requirements/requirements_development.txt @@ -1,6 +1,6 @@ jupyter==1.0.0 jupyter_contrib_nbextensions==0.5.1 -pyinstaller==4.2 +pyinstaller==4.10 autodocsumm==0.2.6 sphinx-rtd-theme==0.5.2 twine==3.4.1 From f37e65c78364d4daf41ff5bbe611b7d4db3e99e6 Mon Sep 17 00:00:00 2001 From: EugeniaVoytik Date: Mon, 4 Apr 2022 15:26:20 +0200 Subject: [PATCH 4/4] =?UTF-8?q?Bump=20version:=201.1.9=20=E2=86=92=201.1.1?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alphaviz/__init__.py | 2 +- misc/bumpversion.cfg | 2 +- release/one_click_linux_gui/control | 2 +- release/one_click_linux_gui/create_installer_linux.sh | 2 +- release/one_click_macos_gui/Info.plist | 4 ++-- release/one_click_macos_gui/create_installer_macos.sh | 4 ++-- release/one_click_macos_gui/distribution.xml | 2 +- release/one_click_windows_gui/alphaviz_innoinstaller.iss | 2 +- release/one_click_windows_gui/create_installer_windows.sh | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/alphaviz/__init__.py b/alphaviz/__init__.py index 94e158d..41e9657 100644 --- a/alphaviz/__init__.py +++ b/alphaviz/__init__.py @@ -1,7 +1,7 @@ #!python __project__ = "alphaviz" -__version__ = "1.1.9" +__version__ = "1.1.10" __license__ = "Apache" __description__ = "A interactive Dashboard to explore mass spectrometry data." __author__ = "Eugenia Voytik" diff --git a/misc/bumpversion.cfg b/misc/bumpversion.cfg index 2f00bc9..3d5c0c7 100644 --- a/misc/bumpversion.cfg +++ b/misc/bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.1.9 +current_version = 1.1.10 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? diff --git a/release/one_click_linux_gui/control b/release/one_click_linux_gui/control index 876c5b3..0b8e2bc 100644 --- a/release/one_click_linux_gui/control +++ b/release/one_click_linux_gui/control @@ -1,5 +1,5 @@ Package: alphaviz -Version: 1.1.9 +Version: 1.1.10 Architecture: all Maintainer: Mann Labs Description: alphaviz diff --git a/release/one_click_linux_gui/create_installer_linux.sh b/release/one_click_linux_gui/create_installer_linux.sh index 13e6075..aa3c52d 100644 --- a/release/one_click_linux_gui/create_installer_linux.sh +++ b/release/one_click_linux_gui/create_installer_linux.sh @@ -17,7 +17,7 @@ python setup.py sdist bdist_wheel # Setting up the local package cd release/one_click_linux_gui # Make sure you include the required extra packages and always use the stable or very-stable options! -pip install "../../dist/alphaviz-1.1.9-py3-none-any.whl[stable,gui-stable]" +pip install "../../dist/alphaviz-1.1.10-py3-none-any.whl[stable,gui-stable]" # Creating the stand-alone pyinstaller folder pip install pyinstaller==4.10 diff --git a/release/one_click_macos_gui/Info.plist b/release/one_click_macos_gui/Info.plist index 9d1b09b..9489786 100644 --- a/release/one_click_macos_gui/Info.plist +++ b/release/one_click_macos_gui/Info.plist @@ -9,9 +9,9 @@ CFBundleIconFile alpha_logo.icns CFBundleIdentifier - alphaviz.1.1.9 + alphaviz.1.1.10 CFBundleShortVersionString - 1.1.9 + 1.1.10 CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/release/one_click_macos_gui/create_installer_macos.sh b/release/one_click_macos_gui/create_installer_macos.sh index 232a865..8cb0112 100644 --- a/release/one_click_macos_gui/create_installer_macos.sh +++ b/release/one_click_macos_gui/create_installer_macos.sh @@ -20,7 +20,7 @@ python setup.py sdist bdist_wheel # Setting up the local package cd release/one_click_macos_gui -pip install "../../dist/alphaviz-1.1.9-py3-none-any.whl[stable,gui-stable]" +pip install "../../dist/alphaviz-1.1.10-py3-none-any.whl[stable,gui-stable]" # Creating the stand-alone pyinstaller folder pip install pyinstaller==4.10 @@ -40,5 +40,5 @@ cp ../../LICENSE.txt Resources/LICENSE.txt cp ../logos/alpha_logo.png Resources/alpha_logo.png chmod 777 scripts/* -pkgbuild --root dist/alphaviz --identifier de.mpg.biochem.alphaviz.app --version 1.1.9 --install-location /Applications/alphaviz.app --scripts scripts alphaviz.pkg +pkgbuild --root dist/alphaviz --identifier de.mpg.biochem.alphaviz.app --version 1.1.10 --install-location /Applications/alphaviz.app --scripts scripts alphaviz.pkg productbuild --distribution distribution.xml --resources Resources --package-path alphaviz.pkg dist/alphaviz_gui_installer_macos.pkg diff --git a/release/one_click_macos_gui/distribution.xml b/release/one_click_macos_gui/distribution.xml index 91b43b1..df0ec6c 100644 --- a/release/one_click_macos_gui/distribution.xml +++ b/release/one_click_macos_gui/distribution.xml @@ -1,6 +1,6 @@ - alphaviz 1.1.9 + alphaviz 1.1.10 diff --git a/release/one_click_windows_gui/alphaviz_innoinstaller.iss b/release/one_click_windows_gui/alphaviz_innoinstaller.iss index cdbeffc..219e729 100644 --- a/release/one_click_windows_gui/alphaviz_innoinstaller.iss +++ b/release/one_click_windows_gui/alphaviz_innoinstaller.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "alphaviz" -#define MyAppVersion "1.1.9" +#define MyAppVersion "1.1.10" #define MyAppPublisher "Max Planck Institute of Biochemistry and the University of Copenhagen, Mann Labs" #define MyAppURL "https://github.com/MannLabs/alphaviz" #define MyAppExeName "alphaviz_gui.exe" diff --git a/release/one_click_windows_gui/create_installer_windows.sh b/release/one_click_windows_gui/create_installer_windows.sh index e249f95..585d024 100644 --- a/release/one_click_windows_gui/create_installer_windows.sh +++ b/release/one_click_windows_gui/create_installer_windows.sh @@ -17,7 +17,7 @@ python setup.py sdist bdist_wheel # Setting up the local package cd release/one_click_windows_gui # Make sure you include the required extra packages and always use the stable or very-stable options! -pip install "../../dist/alphaviz-1.1.9-py3-none-any.whl[stable,gui-stable]" +pip install "../../dist/alphaviz-1.1.10-py3-none-any.whl[stable,gui-stable]" # Creating the stand-alone pyinstaller folder pip install pyinstaller==4.10