Merge pull request #7 from MannLabs/development

Development
MannLabs · Apr 29, 2022 · aa04605 · aa04605
2 parents a58302b + 8ce0a1a
commit aa04605
Show file tree

Hide file tree

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

diff --git a/pydiaid/__init__.py b/pydiaid/__init__.py
@@ -2,7 +2,7 @@
 
 
 __project__ = "pydiaid"
-__version__ = "0.0.15"
+__version__ = "0.0.16"
 __license__ = "Apache"
 __description__ = "An open-source Python package of the AlphaPept ecosystem"
 __author__ = "Patricia Skowronek, Sander Willems, Eugenia Voytik"

diff --git a/pydiaid/loader.py b/pydiaid/loader.py
@@ -288,16 +288,12 @@ def library_loader(
     Returns:
     pd.DataFrame: returns a pre-filtered data frame with unified column names.
     """
+
     if ptm != 'None':
         library[ptm] = library[modified_peptide].apply(
             lambda x: find_PTM(x, ptm)
         )
-        try:
-            library_filtered = library[library[ptm] == True]
-            raise Exception('Modification not in dataset.')
-        except Exception as e:
-            print(e)
-            raise Exception("Is this modification present in the dataset?")
+        library_filtered = library[library[ptm] == True]
         library_subset = library_filtered.drop_duplicates(
             [modified_peptide, charge]
         )

diff --git a/release/one_click_linux_gui/control b/release/one_click_linux_gui/control
@@ -1,5 +1,5 @@
 Package: pydiaid
-Version: 0.0.15
+Version: 0.0.16
 Architecture: all
 Maintainer: Mann Labs <opensource@alphapept.com>
 Description: py_diAID

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/pydiaid-0.0.15-py3-none-any.whl[stable]"
+pip install "../../dist/pydiaid-0.0.16-py3-none-any.whl[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
@@ -9,9 +9,9 @@
 	<key>CFBundleIconFile</key>
 	<string>alpha_logo.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>pydiaid.0.0.15</string>
+	<string>pydiaid.0.0.16</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.15</string>
+	<string>0.0.16</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</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/pydiaid-0.0.15-py3-none-any.whl[stable]"
+pip install "../../dist/pydiaid-0.0.16-py3-none-any.whl[stable]"
 
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller==4.7

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>py_diAID 0.0.15</title>
+    <title>py_diAID 0.0.16</title>
     <background mime-type="image/png" file="alpha_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/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/pydiaid-0.0.15-py3-none-any.whl[stable]"
+pip install "../../dist/pydiaid-0.0.16-py3-none-any.whl[stable]"
 
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller==4.10

diff --git a/release/one_click_windows_gui/pydiaid_innoinstaller.iss b/release/one_click_windows_gui/pydiaid_innoinstaller.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "py_diAID"
-#define MyAppVersion "0.0.15"
+#define MyAppVersion "0.0.16"
 #define MyAppPublisher "Max Planck Institute of Biochemistry, Mann Labs"
 #define MyAppURL "https://github.com/MannLabs/pydiaid"
 #define MyAppExeName "pydiaid_gui.exe"