diff --git a/.bumpversion.cfg b/.bumpversion.cfg index dd1cff97..0434b563 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.3.30 +current_version = 0.3.31 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? @@ -34,6 +34,5 @@ serialize = [bumpversion:file:./release/one_click_windows_gui/create_installer_windows.sh] [bumpversion:file:./release/one_click_windows_gui/alphapept_innoinstaller.iss] - search = {current_version} replace = {new_version} diff --git a/alphapept/__init__.py b/alphapept/__init__.py index f490b13b..4121a532 100644 --- a/alphapept/__init__.py +++ b/alphapept/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.3.30" +__version__ = "0.3.31" __requirements__ = { "": "requirements/requirements.txt", diff --git a/alphapept/__version__.py b/alphapept/__version__.py index d6c45c33..fe48a3fc 100644 --- a/alphapept/__version__.py +++ b/alphapept/__version__.py @@ -33,7 +33,7 @@ AUTHOR_EMAIL = "straussmaximilian@gmail.com" COPYRIGHT = "Mann Labs" BRANCH = "master" -VERSION_NO = "0.3.30" +VERSION_NO = "0.3.31" MIN_PYTHON = "3.6" MAX_PYTHON = "4" AUDIENCE = "Developers" diff --git a/installer/one_click_windows/alphapept_innoinstaller.iss b/installer/one_click_windows/alphapept_innoinstaller.iss index 7b660ee5..db01fac4 100644 --- a/installer/one_click_windows/alphapept_innoinstaller.iss +++ b/installer/one_click_windows/alphapept_innoinstaller.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "AlphaPept" -#define MyAppVersion "0.3.30" +#define MyAppVersion "0.3.31" #define MyAppPublisher "MannLabs" #define MyAppURL "https://github.com/MannLabs/alphapept" #define MyAppExeName "alphapept.exe" diff --git a/installer/one_click_windows/create_installer_windows.bat b/installer/one_click_windows/create_installer_windows.bat index f6cfa960..f8d943ec 100644 --- a/installer/one_click_windows/create_installer_windows.bat +++ b/installer/one_click_windows/create_installer_windows.bat @@ -12,7 +12,7 @@ call DEL /F/Q/S dist > NUL call RMDIR /Q/S build call RMDIR /Q/S dist call python setup.py sdist bdist_wheel -call pip install dist/alphapept-0.3.30-py3-none-any.whl[stable,gui-stable] +call pip install dist/alphapept-0.3.31-py3-none-any.whl[stable,gui-stable] call pip install pyinstaller==4.7 call cd installer/one_click_windows call pyinstaller ../alphapept.spec -y diff --git a/release/one_click_linux_gui/control b/release/one_click_linux_gui/control index a0452203..551a48be 100644 --- a/release/one_click_linux_gui/control +++ b/release/one_click_linux_gui/control @@ -1,5 +1,5 @@ Package: alphapept -Version: 0.3.30 +Version: 0.3.31 Architecture: all Maintainer: Mann Labs Description: AlphaPept diff --git a/release/one_click_linux_gui/create_installer_linux.sh b/release/one_click_linux_gui/create_installer_linux.sh index 4a3f529b..0ee9b579 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/alphapept-0.3.30-py3-none-any.whl[stable,gui-stable]" +pip install "../../dist/alphapept-0.3.31-py3-none-any.whl[stable,gui-stable]" # Creating the stand-alone pyinstaller folder pip install pyinstaller==4.2 diff --git a/release/one_click_macos_gui/Info.plist b/release/one_click_macos_gui/Info.plist index 4ae39635..37c56ba9 100644 --- a/release/one_click_macos_gui/Info.plist +++ b/release/one_click_macos_gui/Info.plist @@ -9,9 +9,9 @@ CFBundleIconFile alpha_logo.icns CFBundleIdentifier - alphapept.0.3.30 + alphapept.0.3.31 CFBundleShortVersionString - 0.3.30 + 0.3.31 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 0de6b2e8..4970f8c6 100644 --- 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/alphapept-0.3.30-py3-none-any.whl[stable,gui-stable]" +pip install "../../dist/alphapept-0.3.31-py3-none-any.whl[stable,gui-stable]" # Creating the stand-alone pyinstaller folder pip install pyinstaller==4.2 @@ -40,5 +40,5 @@ cp ../../LICENSE.txt Resources/LICENSE.txt cp ../logos/alpha_logo.png Resources/alpha_logo.png chmod 777 scripts/* -pkgbuild --root dist/alphapept --identifier de.mpg.biochem.alphapept.app --version 0.3.30 --install-location /Applications/alphapept.app --scripts scripts alphapept.pkg +pkgbuild --root dist/alphapept --identifier de.mpg.biochem.alphapept.app --version 0.3.31 --install-location /Applications/alphapept.app --scripts scripts alphapept.pkg productbuild --distribution distribution.xml --resources Resources --package-path alphapept.pkg dist/alphapept_gui_installer_macos.pkg diff --git a/release/one_click_macos_gui/distribution.xml b/release/one_click_macos_gui/distribution.xml index 55570db5..77d788eb 100644 --- a/release/one_click_macos_gui/distribution.xml +++ b/release/one_click_macos_gui/distribution.xml @@ -1,6 +1,6 @@ - alphapept 0.3.30 + alphapept 0.3.31 diff --git a/release/one_click_windows_gui/alphapept_innoinstaller.iss b/release/one_click_windows_gui/alphapept_innoinstaller.iss index 1a178013..60d266e3 100644 --- a/release/one_click_windows_gui/alphapept_innoinstaller.iss +++ b/release/one_click_windows_gui/alphapept_innoinstaller.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "AlphaPept" -#define MyAppVersion "0.3.30" +#define MyAppVersion "0.3.31" #define MyAppPublisher "MannLabs" #define MyAppURL "https://github.com/MannLabs/alphapept" #define MyAppExeName "alphapept.exe" diff --git a/release/one_click_windows_gui/create_installer_windows.sh b/release/one_click_windows_gui/create_installer_windows.sh index 37fc6bff..d88e8183 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/alphapept-0.3.30-py3-none-any.whl[stable,gui-stable]" +pip install "../../dist/alphapept-0.3.31-py3-none-any.whl[stable,gui-stable]" # Creating the stand-alone pyinstaller folder pip install pyinstaller==4.2 diff --git a/settings.ini b/settings.ini index 064682ea..c353ea20 100644 --- a/settings.ini +++ b/settings.ini @@ -7,7 +7,7 @@ author = Maximilian T. Strauss author_email = straussmaximilian@gmail.com copyright = Mann Labs branch = master -version = 0.3.30 +version = 0.3.31 min_python = 3.6 max_python = 4 audience = Developers