From 559a2ea9eb06127c62dad1fb40af3ea6e1f1196c Mon Sep 17 00:00:00 2001 From: elena-krismer Date: Tue, 18 Apr 2023 17:33:45 +0200 Subject: [PATCH 1/2] fix #173 --- alphastats/gui/utils/software_options.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alphastats/gui/utils/software_options.py b/alphastats/gui/utils/software_options.py index 39807c5b..59501de0 100644 --- a/alphastats/gui/utils/software_options.py +++ b/alphastats/gui/utils/software_options.py @@ -25,8 +25,8 @@ }, "FragPipe": { "import_file": "combined_protein.tsv", - "intensity_column": ["[sample] MaxLFQ Intensity "], - "index_column": ["Protein"], + "intensity_column": ["[sample] MaxLFQ Intensity", "[sample] Intensity"], + "index_column": ["Protein", "Protein ID"], "loader_function": FragPipeLoader, }, "Spectronaut": { From f9835cecae2ea38c9da9c5a1dbc949eef7b8bf47 Mon Sep 17 00:00:00 2001 From: elena-krismer Date: Tue, 18 Apr 2023 17:37:13 +0200 Subject: [PATCH 2/2] bumpversion 0.5.2 -> 0.5.3 --- .bumpversion.cfg | 2 +- HISTORY.md | 3 +++ alphastats/__init__.py | 2 +- docs/conf.py | 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 | 2 +- release/one_click_macos_gui/distribution.xml | 2 +- release/one_click_windows_gui/alphastats_innoinstaller.iss | 2 +- release/one_click_windows_gui/create_installer_windows.sh | 2 +- 11 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 4cb6e5dc..ee54647a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.2 +current_version = 0.5.3 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? diff --git a/HISTORY.md b/HISTORY.md index 632cabfc..8a8ce005 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,8 @@ # Changelog +# 0.5.3 +* FIX FragPipe loading issue + # 0.5.2 * FIX FragPipe import #173 diff --git a/alphastats/__init__.py b/alphastats/__init__.py index ccedb29c..79c82634 100644 --- a/alphastats/__init__.py +++ b/alphastats/__init__.py @@ -1,5 +1,5 @@ __project__ = "alphastats" -__version__ = "0.5.2" +__version__ = "0.5.3" __license__ = "Apache" __description__ = "An open-source Python package for Mass Spectrometry Analysis" __author__ = "Mann Labs" diff --git a/docs/conf.py b/docs/conf.py index 6693e433..66dbcea2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -23,7 +23,7 @@ author = "Elena Krismer" # The full version, including alpha/beta/rc tags -release = "0.5.2" +release = "0.5.3" # -- General configuration --------------------------------------------------- diff --git a/release/one_click_linux_gui/control b/release/one_click_linux_gui/control index f9c64e0a..2b45cc8c 100644 --- a/release/one_click_linux_gui/control +++ b/release/one_click_linux_gui/control @@ -1,5 +1,5 @@ Package: alphastats -Version: 0.5.2 +Version: 0.5.3 Architecture: all Maintainer: MannLabs Description: alphastats diff --git a/release/one_click_linux_gui/create_installer_linux.sh b/release/one_click_linux_gui/create_installer_linux.sh index 58630881..3cd86d59 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/alphastats-0.5.2-py3-none-any.whl" +pip install "../../dist/alphastats-0.5.3-py3-none-any.whl" # Creating the stand-alone pyinstaller folder pip install pyinstaller==5.8 diff --git a/release/one_click_macos_gui/Info.plist b/release/one_click_macos_gui/Info.plist index bd1672d4..191b18cf 100644 --- a/release/one_click_macos_gui/Info.plist +++ b/release/one_click_macos_gui/Info.plist @@ -9,9 +9,9 @@ CFBundleIconFile alphapeptstats_logo.icns CFBundleIdentifier - alphastats.0.5.2 + alphastats.0.5.3 CFBundleShortVersionString - 0.5.2 + 0.5.3 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 13ea9070..9ca082fc 100755 --- 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/alphastats-0.5.2-py3-none-any.whl" +pip install "../../dist/alphastats-0.5.3-py3-none-any.whl" # Creating the stand-alone pyinstaller folder pip install pyinstaller==5.8 diff --git a/release/one_click_macos_gui/distribution.xml b/release/one_click_macos_gui/distribution.xml index 0399da2a..f5198c13 100644 --- a/release/one_click_macos_gui/distribution.xml +++ b/release/one_click_macos_gui/distribution.xml @@ -1,6 +1,6 @@ - AlphaPeptStats 0.5.2 + AlphaPeptStats 0.5.3 diff --git a/release/one_click_windows_gui/alphastats_innoinstaller.iss b/release/one_click_windows_gui/alphastats_innoinstaller.iss index 757f54e5..64e2949a 100644 --- a/release/one_click_windows_gui/alphastats_innoinstaller.iss +++ b/release/one_click_windows_gui/alphastats_innoinstaller.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "AlphaPeptStats" -#define MyAppVersion "0.5.2" +#define MyAppVersion "0.5.3" #define MyAppPublisher "MannLabs" #define MyAppURL "https://github.com/MannLabs/alphapeptstats" #define MyAppExeName "alphastats_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 3af6aaa7..182e41c5 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/alphastats-0.5.2-py3-none-any.whl" +pip install "../../dist/alphastats-0.5.3-py3-none-any.whl" # Creating the stand-alone pyinstaller folder pip install pyinstaller==5.8