Merge pull request #288 from MannLabs/main_to_dev

bump dev to 0.6.7
MannLabs · Jul 11, 2024 · 5960786 · 5960786
2 parents a4144fe + 99ae051
commit 5960786
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 18 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.6
+current_version = 0.6.7
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# 0.6.7
+* FIX allowing to save multiple plots of the same type
+* FIX uninitialized functions
+
 # 0.6.6
 * FIX preprocessing with 0 / NA discrepancy
 

diff --git a/alphastats/__init__.py b/alphastats/__init__.py
@@ -1,5 +1,5 @@
 __project__ = "alphastats"
-__version__ = "0.6.6"
+__version__ = "0.6.7"
 __license__ = "Apache"
 __description__ = "An open-source Python package for Mass Spectrometry Analysis"
 __author__ = "Mann Labs"

diff --git a/alphastats/gui/pages/02_Import Data.py b/alphastats/gui/pages/02_Import Data.py
@@ -1,7 +1,6 @@
-import io
-import os
-
 import streamlit as st
+import os
+import io
 
 try:
     from alphastats.DataSet import DataSet
@@ -420,6 +419,8 @@ def empty_session_state():
     )
 
     load_sample_data()
+    if "distribution_plot" not in st.session_state:
+        save_plot_sampledistribution_rawdata()
 
 
 st.markdown("### To start a new session:")

diff --git a/alphastats/gui/pages/06_Results.py b/alphastats/gui/pages/06_Results.py
@@ -53,13 +53,11 @@ def download_preprocessing_info(plot, name, count):
 
         st.markdown("\n\n")
         name = plot[0]
-        print("name", name)
         plot = plot[1]
         if name == "ttest":
             plot = plot.plot
         st.write(name)
 
-        print(plot)
         display_plotly_figure(plot)
 
         col1, col2, col3 = st.columns([1, 1, 1])
@@ -72,7 +70,5 @@ def download_preprocessing_info(plot, name, count):
 
         with col3:
             download_preprocessing_info(plot, name, count)
-
-
 else:
     st.info("No analysis performed yet.")
diff --git 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.6"
+release = "0.6.7"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/release/one_click_linux_gui/control b/release/one_click_linux_gui/control
@@ -1,5 +1,5 @@
 Package: alphastats
-Version: 0.6.6
+Version: 0.6.7
 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
@@ -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.6-py3-none-any.whl"
+pip install "../../dist/alphastats-0.6.7-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
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string>alphapeptstats_logo.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>alphastats.0.6.6</string>
+	<string>alphastats.0.6.7</string>
 	<key>CFBundleShortVersionString</key>
 	<string>0.6.0</string>
 	<key>CFBundleInfoDictionaryVersion</key>

diff --git 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.6-py3-none-any.whl"
+pip install "../../dist/alphastats-0.6.7-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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <installer-script minSpecVersion="1.000000">
-    <title>AlphaPeptStats 0.6.6</title>
+    <title>AlphaPeptStats 0.6.7</title>
     <background mime-type="image/png" file="alphapeptstats_logo.png" scaling="proportional"/>
     <welcome file="welcome.html" mime-type="text/html" />
     <conclusion file="conclusion.html" mime-type="text/html" />

diff --git 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.6"
+#define MyAppVersion "0.6.7"
 #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
@@ -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.6-py3-none-any.whl"
+pip install "../../dist/alphastats-0.6.7-py3-none-any.whl"
 
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller==5.8

diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@ def create_pip_wheel():
     requirements = get_requirements()
     setuptools.setup(
         name="alphastats",
-        version="0.6.6",
+        version="0.6.7",
         license="Apache",
         description="An open-source Python package for automated and scalable statistical analysis of mass spectrometry-based proteomics",
         long_description=get_long_description(),