sync dev with main

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.5
+current_version = 0.6.6
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?
@@ -14,3 +14,39 @@ serialize =
 [bumpversion:file:./alphastats/__init__.py]
 search = {current_version}
 replace = {new_version}
+
+[bumpversion:file:./setup.py]
+search = {current_version}
+replace = {new_version}
+
+[bumpversion:file:./docs/conf.py]
+search = {current_version}
+replace = {new_version}
+
+[bumpversion:file:./release/one_click_linux_gui/control]
+search = {current_version}
+replace = {new_version}
+
+[bumpversion:file:./release/one_click_linux_gui/create_installer_linux.sh]
+search = {current_version}
+replace = {new_version}
+
+[bumpversion:file:./release/one_click_macos_gui/Info.plist]
+search = {current_version}
+replace = {new_version}
+
+[bumpversion:file:./release/one_click_macos_gui/create_installer_macos.sh]
+search = {current_version}
+replace = {new_version}
+
+[bumpversion:file:./release/one_click_macos_gui/distribution.xml]
+search = {current_version}
+replace = {new_version}
+
+[bumpversion:file:./release/one_click_windows_gui/alphastats_innoinstaller.iss]
+search = {current_version}
+replace = {new_version}
+
+[bumpversion:file:./release/one_click_windows_gui/create_installer_windows.sh]
+search = {current_version}
+replace = {new_version}

.github/workflows/publish_on_pypi.yml

@@ -13,6 +13,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: conda-incubator/setup-miniconda@v2
         with:
+          miniconda-version: "latest"
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
       - name: Master version bumped
@@ -39,6 +40,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: conda-incubator/setup-miniconda@v2
         with:
+          miniconda-version: "latest"
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
       - name: Conda info
@@ -82,6 +84,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: conda-incubator/setup-miniconda@v2
         with:
+          miniconda-version: "latest"
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
       - name: Conda info

.github/workflows/release_on_click_installer.yml

@@ -40,6 +40,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: conda-incubator/setup-miniconda@v2
         with:
+          miniconda-version: "latest"
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
       - name: Conda info
@@ -72,6 +73,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: conda-incubator/setup-miniconda@v2
         with:
+          miniconda-version: "latest"
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
       - name: Conda info
@@ -104,6 +106,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: conda-incubator/setup-miniconda@v2
         with:
+          miniconda-version: "latest"
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
       - name: Conda info
@@ -130,4 +133,4 @@ jobs:
           upload_url: ${{ needs.Create_Draft_On_GitHub.outputs.upload_url }}
           asset_path: release/one_click_windows_gui/dist/alphastats_gui_installer_windows.exe
           asset_name: alphastats_gui_installer_windows.exe
-          asset_content_type: application/octet-stream
+          asset_content_type: application/octet-stream

HISTORY.md

@@ -1,5 +1,8 @@
 # Changelog
 
+# 0.6.6
+* FIX preprocessing with 0 / NA discrepancy
+
 # 0.6.5
 * FIX coloring of plot_sampledistribution issue #229
 * ADD nbformat requirement issue #230

alphastats/__init__.py

@@ -1,5 +1,5 @@
 __project__ = "alphastats"
-__version__ = "0.6.5"
+__version__ = "0.6.6"
 __license__ = "Apache"
 __description__ = "An open-source Python package for Mass Spectrometry Analysis"
 __author__ = "Mann Labs"

docs/conf.py

@@ -23,7 +23,7 @@
 author = "Elena Krismer"
 
 # The full version, including alpha/beta/rc tags
-release = "0.6.4"
+release = "0.6.6"
 
 
 # -- General configuration ---------------------------------------------------

release/one_click_linux_gui/control

@@ -1,5 +1,5 @@
 Package: alphastats
-Version: 0.6.5
+Version: 0.6.6
 Architecture: all
 Maintainer: MannLabs
 Description: alphastats

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.5-py3-none-any.whl"
+pip install "../../dist/alphastats-0.6.6-py3-none-any.whl"
 
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller==5.8

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.5</string>
+	<string>alphastats.0.6.6</string>
 	<key>CFBundleShortVersionString</key>
 	<string>0.6.0</string>
 	<key>CFBundleInfoDictionaryVersion</key>

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.5-py3-none-any.whl"
+pip install "../../dist/alphastats-0.6.6-py3-none-any.whl"
 
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller==5.8

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.5</title>
+    <title>AlphaPeptStats 0.6.6</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" />

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.5"
+#define MyAppVersion "0.6.6"
 #define MyAppPublisher "MannLabs"
 #define MyAppURL "https://github.com/MannLabs/alphapeptstats"
 #define MyAppExeName "alphastats_gui.exe"

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.5-py3-none-any.whl"
+pip install "../../dist/alphastats-0.6.6-py3-none-any.whl"
 
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller==5.8

setup.py

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