diff --git a/.bumpversion.cfg b/.bumpversion.cfg index f79bd81a..f427a4a3 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.2.1 +current_version = 1.3.0 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? @@ -23,23 +23,22 @@ serialize = [bumpversion:file:./release/linux/build_package_linux.sh] -[bumpversion:file:./release/linux/create_installer_linux.sh] # TODO remove with old release workflow +[bumpversion:file:./release/linux/create_installer_linux.sh] [bumpversion:file:./release/macos/distribution.xml] [bumpversion:file:./release/macos/Info.plist] -[bumpversion:file:./release/macos/create_installer_macos.sh] # TODO remove with old release workflow +[bumpversion:file:./release/macos/create_installer_macos.sh] [bumpversion:file:./release/macos/build_installer_macos.sh] [bumpversion:file:./release/macos/build_package_macos.sh] -[bumpversion:file:./release/windows/create_installer_windows.sh] # TODO remove with old release workflow +[bumpversion:file:./release/windows/create_installer_windows.sh] [bumpversion:file:./release/windows/build_installer_windows.ps1] [bumpversion:file:./release/windows/peptdeep_innoinstaller.iss] - search = {current_version} replace = {new_version} diff --git a/README.md b/README.md index a0cb58d8..a90042dd 100644 --- a/README.md +++ b/README.md @@ -112,10 +112,10 @@ The GUI of peptdeep is a completely stand-alone tool that requires no knowledge of Python or CLI tools. Click on one of the links below to download the latest release for: -- [**Windows**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.2.1-windows-amd64.exe) -- [**macOS**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.2.1-macos-darwin-x64.pkg) -- [**macOS ARM**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.2.1-macos-darwin-arm64.pkg ) -- [**Linux**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.2.1-linux-x64.deb) +- [**Windows**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.3.0-windows-amd64.exe) +- [**macOS**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.3.0-macos-darwin-x64.pkg) +- [**macOS ARM**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.3.0-macos-darwin-arm64.pkg ) +- [**Linux**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.3.0-linux-x64.deb) Older releases remain available on the [release page](https://github.com/MannLabs/alphapeptdeep/releases), but no diff --git a/docs/conf.py b/docs/conf.py index 6631a6bc..4161b225 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -24,7 +24,7 @@ copyright = "2022, Mann Labs, MPIB" author = "Mann Labs, MPIB" -release = "1.2.1" +release = "1.3.0" # -- General configuration --------------------------------------------------- diff --git a/peptdeep/__init__.py b/peptdeep/__init__.py index bf3e23db..6e46562d 100644 --- a/peptdeep/__init__.py +++ b/peptdeep/__init__.py @@ -11,7 +11,7 @@ # pass __project__ = "peptdeep" -__version__ = "1.2.1" +__version__ = "1.3.0" __license__ = "Apache 2.0" __description__ = "The AlphaX deep learning framework for Proteomics" __author__ = "Mann Labs" diff --git a/release/linux/build_installer_linux.sh b/release/linux/build_installer_linux.sh index b0263187..d2f4ab7c 100755 --- a/release/linux/build_installer_linux.sh +++ b/release/linux/build_installer_linux.sh @@ -14,7 +14,7 @@ python setup.py sdist bdist_wheel # Setting up the local package # Make sure you include the required extra packages and always use the stable or very-stable options! -pip install "dist/peptdeep-1.2.1-py3-none-any.whl[stable]" +pip install "dist/peptdeep-1.3.0-py3-none-any.whl[stable]" if [ "${CPU_OR_GPU}" != "GPU" ]; then pip install torch -U --extra-index-url https://download.pytorch.org/whl/cpu diff --git a/release/linux/build_package_linux.sh b/release/linux/build_package_linux.sh index ba69d641..1eb2b6c8 100755 --- a/release/linux/build_package_linux.sh +++ b/release/linux/build_package_linux.sh @@ -6,7 +6,7 @@ set -e -u PACKAGE_NAME=peptdeep -# BUILD_NAME is taken from environment variables, e.g. 'peptdeep-1.2.1-linux-x64' +# BUILD_NAME is taken from environment variables, e.g. 'peptdeep-1.3.0-linux-x64' rm -rf ${BUILD_NAME}.deb # If needed, include additional source such as e.g.: diff --git a/release/linux/control b/release/linux/control index 5131416a..71b717df 100644 --- a/release/linux/control +++ b/release/linux/control @@ -1,5 +1,5 @@ Package: peptdeep -Version: 1.2.1 +Version: 1.3.0 Architecture: all Maintainer: Mann Labs Description: peptdeep diff --git a/release/linux/create_installer_linux.sh b/release/linux/create_installer_linux.sh index 26ab126f..b0559255 100755 --- a/release/linux/create_installer_linux.sh +++ b/release/linux/create_installer_linux.sh @@ -17,7 +17,7 @@ python setup.py sdist bdist_wheel # Setting up the local package cd release/linux # Make sure you include the required extra packages and always use the stable or very-stable options! -pip install "../../dist/peptdeep-1.2.1-py3-none-any.whl[stable]" +pip install "../../dist/peptdeep-1.3.0-py3-none-any.whl[stable]" if [ "$1" == "CPU" ]; then pip install torch -U --extra-index-url https://download.pytorch.org/whl/cpu diff --git a/release/macos/Info.plist b/release/macos/Info.plist index 229b9ddd..e24b818d 100644 --- a/release/macos/Info.plist +++ b/release/macos/Info.plist @@ -9,9 +9,9 @@ CFBundleIconFile alpha_logo.icns CFBundleIdentifier - peptdeep.1.2.1 + peptdeep.1.3.0 CFBundleShortVersionString - 1.2.1 + 1.3.0 CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/release/macos/build_installer_macos.sh b/release/macos/build_installer_macos.sh index 9fda2e39..ab16008f 100755 --- a/release/macos/build_installer_macos.sh +++ b/release/macos/build_installer_macos.sh @@ -9,7 +9,7 @@ rm -rf build # Creating the wheel python setup.py sdist bdist_wheel -pip install "dist/peptdeep-1.2.1-py3-none-any.whl[stable]" +pip install "dist/peptdeep-1.3.0-py3-none-any.whl[stable]" # Creating the stand-alone pyinstaller folder pyinstaller release/pyinstaller/peptdeep.spec --distpath dist_pyinstaller --workpath build_pyinstaller -y diff --git a/release/macos/build_package_macos.sh b/release/macos/build_package_macos.sh index 7ec0eabc..4897b662 100755 --- a/release/macos/build_package_macos.sh +++ b/release/macos/build_package_macos.sh @@ -5,7 +5,7 @@ set -e -u # This script must be run from the root of the repository after running build_installer_macos.sh PACKAGE_NAME=peptdeep -# BUILD_NAME is taken from environment variables, e.g. peptdeep-1.2.1-macos-darwin-arm64 or peptdeep-1.2.1-macos-darwin-x64 +# BUILD_NAME is taken from environment variables, e.g. peptdeep-1.3.0-macos-darwin-arm64 or peptdeep-1.3.0-macos-darwin-x64 rm -rf ${BUILD_NAME}.pkg # If needed, include additional source such as e.g.: @@ -30,5 +30,5 @@ cd - chmod 777 release/macos/scripts/* -pkgbuild --root dist_pyinstaller/${PACKAGE_NAME} --identifier de.mpg.biochem.${PACKAGE_NAME}.app --version 1.2.1 --install-location /Applications/${PACKAGE_NAME}.app --scripts release/macos/scripts ${PACKAGE_NAME}.pkg +pkgbuild --root dist_pyinstaller/${PACKAGE_NAME} --identifier de.mpg.biochem.${PACKAGE_NAME}.app --version 1.3.0 --install-location /Applications/${PACKAGE_NAME}.app --scripts release/macos/scripts ${PACKAGE_NAME}.pkg productbuild --distribution release/macos/distribution.xml --resources release/macos/Resources --package-path ${PACKAGE_NAME}.pkg ${BUILD_NAME}.pkg diff --git a/release/macos/create_installer_macos.sh b/release/macos/create_installer_macos.sh index d8c88fdb..b09e542c 100644 --- a/release/macos/create_installer_macos.sh +++ b/release/macos/create_installer_macos.sh @@ -21,7 +21,7 @@ python setup.py sdist bdist_wheel # Setting up the local package cd release/macos -pip install "../../dist/peptdeep-1.2.1-py3-none-any.whl[stable]" +pip install "../../dist/peptdeep-1.3.0-py3-none-any.whl[stable]" # Creating the stand-alone pyinstaller folder pip install pyinstaller @@ -41,5 +41,5 @@ cp ../../LICENSE.txt Resources/LICENSE.txt cp ../logos/alpha_logo.png Resources/alpha_logo.png chmod 777 scripts/* -pkgbuild --root dist/peptdeep --identifier de.mpg.biochem.peptdeep.app --version 1.2.1 --install-location /Applications/peptdeep.app --scripts scripts peptdeep.pkg +pkgbuild --root dist/peptdeep --identifier de.mpg.biochem.peptdeep.app --version 1.3.0 --install-location /Applications/peptdeep.app --scripts scripts peptdeep.pkg productbuild --distribution distribution.xml --resources Resources --package-path peptdeep.pkg dist/peptdeep_gui_installer_macos.pkg diff --git a/release/macos/distribution.xml b/release/macos/distribution.xml index 82eb3368..72f743ff 100644 --- a/release/macos/distribution.xml +++ b/release/macos/distribution.xml @@ -1,6 +1,6 @@ - peptdeep 1.2.1 + peptdeep 1.3.0 diff --git a/release/windows/build_installer_windows.ps1 b/release/windows/build_installer_windows.ps1 index 765d5be4..fa621924 100644 --- a/release/windows/build_installer_windows.ps1 +++ b/release/windows/build_installer_windows.ps1 @@ -10,7 +10,7 @@ Remove-Item -Recurse -Force -ErrorAction SilentlyContinue ./dist_pyinstaller # Creating the wheel python setup.py sdist bdist_wheel # Make sure you include the required extra packages and always use the stable or very-stable options! -pip install "dist/peptdeep-1.2.1-py3-none-any.whl[stable]" +pip install "dist/peptdeep-1.3.0-py3-none-any.whl[stable]" # Creating the stand-alone pyinstaller folder pyinstaller release/pyinstaller/peptdeep.spec --distpath dist_pyinstaller --workpath build_pyinstaller -y diff --git a/release/windows/create_installer_windows.sh b/release/windows/create_installer_windows.sh index 21abe9d4..e349f61c 100644 --- a/release/windows/create_installer_windows.sh +++ b/release/windows/create_installer_windows.sh @@ -18,7 +18,7 @@ python setup.py sdist bdist_wheel # Setting up the local package cd release/windows # Make sure you include the required extra packages and always use the stable or very-stable options! -pip install "../../dist/peptdeep-1.2.1-py3-none-any.whl[stable]" +pip install "../../dist/peptdeep-1.3.0-py3-none-any.whl[stable]" # Creating the stand-alone pyinstaller folder pip install pyinstaller diff --git a/release/windows/peptdeep_innoinstaller.iss b/release/windows/peptdeep_innoinstaller.iss index c71fb45b..7e1a9069 100644 --- a/release/windows/peptdeep_innoinstaller.iss +++ b/release/windows/peptdeep_innoinstaller.iss @@ -5,7 +5,7 @@ ; so all paths are given relative to the location of this .iss file. #define MyAppName "peptdeep" -#define MyAppVersion "1.2.1" +#define MyAppVersion "1.3.0" #define MyAppPublisher "Max Planck Institute of Biochemistry and the University of Copenhagen, Mann Labs" #define MyAppURL "https://github.com/MannLabs/peptdeep" #define MyAppExeName "peptdeep_gui.exe" @@ -30,7 +30,7 @@ PrivilegesRequired=lowest PrivilegesRequiredOverridesAllowed=dialog ; release workflow expects artifact at root of repository OutputDir=..\..\ -; example for BUILD_NAME: peptdeep-1.2.1-windows-amd64 +; example for BUILD_NAME: peptdeep-1.3.0-windows-amd64 OutputBaseFilename={#GetEnv('BUILD_NAME')} SetupIconFile=..\logos\alpha_logo.ico Compression=lzma