From ac8b27cc40c72b1c5a7c6ba0aabf498dd0eb3700 Mon Sep 17 00:00:00 2001 From: mschwoerer <82171591+mschwoer@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:39:40 +0200 Subject: [PATCH 1/2] fix a bug introduced in the last commit --- alphastats/plots/VolcanoPlot.py | 2 +- alphastats/statistics/DifferentialExpressionAnalysis.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/alphastats/plots/VolcanoPlot.py b/alphastats/plots/VolcanoPlot.py index f5916341..80d2319f 100644 --- a/alphastats/plots/VolcanoPlot.py +++ b/alphastats/plots/VolcanoPlot.py @@ -149,7 +149,7 @@ def _sam(self): transposed = self.dataset.mat.transpose() - if self.dataset.preprocessing_info["Log2-transformed"] is None: + if not self.dataset.preprocessing_info["Log2-transformed"]: # needs to be lpog2 transformed for fold change calculations transposed = transposed.transform(lambda x: np.log2(x)) diff --git a/alphastats/statistics/DifferentialExpressionAnalysis.py b/alphastats/statistics/DifferentialExpressionAnalysis.py index 5bcdf13b..7b1d10ed 100644 --- a/alphastats/statistics/DifferentialExpressionAnalysis.py +++ b/alphastats/statistics/DifferentialExpressionAnalysis.py @@ -90,7 +90,7 @@ def sam(self) -> pd.DataFrame: from alphastats.multicova import multicova transposed = self.dataset.mat.transpose() - if self.dataset.preprocessing_info["Log2-transformed"] is None: + if not self.dataset.preprocessing_info["Log2-transformed"]: # needs to be lpog2 transformed for fold change calculations transposed = transposed.transform(lambda x: np.log2(x)) From b00cc2f5c0b59358ce5a9b864a18262243a8e292 Mon Sep 17 00:00:00 2001 From: mschwoerer <82171591+mschwoer@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:39:42 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Bump=20version:=200.6.8=20=E2=86=92=200.6.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- 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 | 2 +- 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 +- setup.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 57c98c2d..f7b6f01c 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.6.8 +current_version = 0.6.9 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? diff --git a/alphastats/__init__.py b/alphastats/__init__.py index 6743abcb..4a233732 100644 --- a/alphastats/__init__.py +++ b/alphastats/__init__.py @@ -1,5 +1,5 @@ __project__ = "alphastats" -__version__ = "0.6.8" +__version__ = "0.6.9" __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 cda99505..e16dd294 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.6.8" +release = "0.6.9" # -- General configuration --------------------------------------------------- diff --git a/release/one_click_linux_gui/control b/release/one_click_linux_gui/control index eb0b359d..25497dba 100644 --- a/release/one_click_linux_gui/control +++ b/release/one_click_linux_gui/control @@ -1,5 +1,5 @@ Package: alphastats -Version: 0.6.8 +Version: 0.6.9 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 3b0fb8e2..3ea286bb 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.6.8-py3-none-any.whl" +pip install "../../dist/alphastats-0.6.9-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 22416341..575e68a1 100644 --- a/release/one_click_macos_gui/Info.plist +++ b/release/one_click_macos_gui/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile alphapeptstats_logo.icns CFBundleIdentifier - alphastats.0.6.8 + alphastats.0.6.9 CFBundleShortVersionString 0.6.0 CFBundleInfoDictionaryVersion diff --git a/release/one_click_macos_gui/create_installer_macos.sh b/release/one_click_macos_gui/create_installer_macos.sh index 5701c0d2..3e62f450 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.6.8-py3-none-any.whl" +pip install "../../dist/alphastats-0.6.9-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 4fa4e4f5..1008dc4c 100644 --- a/release/one_click_macos_gui/distribution.xml +++ b/release/one_click_macos_gui/distribution.xml @@ -1,6 +1,6 @@ - AlphaPeptStats 0.6.8 + AlphaPeptStats 0.6.9 diff --git a/release/one_click_windows_gui/alphastats_innoinstaller.iss b/release/one_click_windows_gui/alphastats_innoinstaller.iss index 52c5adcd..c482b10d 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.6.8" +#define MyAppVersion "0.6.9" #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 1e992344..ffc4b55b 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.6.8-py3-none-any.whl" +pip install "../../dist/alphastats-0.6.9-py3-none-any.whl" # Creating the stand-alone pyinstaller folder pip install pyinstaller==5.8 diff --git a/setup.py b/setup.py index 757801ca..75777c8f 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ def create_pip_wheel(): requirements = get_requirements() setuptools.setup( name="alphastats", - version="0.6.8", + version="0.6.9", license="Apache", description="An open-source Python package for automated and scalable statistical analysis of mass spectrometry-based proteomics", long_description=get_long_description(),