Skip to content

Commit

Permalink
Bump version: 1.2.1 → 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jalew188 committed Sep 12, 2024
1 parent f29adc4 commit e87f2dc
Show file tree
Hide file tree
Showing 16 changed files with 26 additions and 27 deletions.
9 changes: 4 additions & 5 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.2.1
current_version = 1.3.0
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?
Expand All @@ -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}
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
copyright = "2022, Mann Labs, MPIB"
author = "Mann Labs, MPIB"

release = "1.2.1"
release = "1.3.0"

# -- General configuration ---------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion peptdeep/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion release/linux/build_installer_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion release/linux/build_package_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.:
Expand Down
2 changes: 1 addition & 1 deletion release/linux/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: peptdeep
Version: 1.2.1
Version: 1.3.0
Architecture: all
Maintainer: Mann Labs <[email protected]>
Description: peptdeep
Expand Down
2 changes: 1 addition & 1 deletion release/linux/create_installer_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions release/macos/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<key>CFBundleIconFile</key>
<string>alpha_logo.icns</string>
<key>CFBundleIdentifier</key>
<string>peptdeep.1.2.1</string>
<string>peptdeep.1.3.0</string>
<key>CFBundleShortVersionString</key>
<string>1.2.1</string>
<string>1.3.0</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
2 changes: 1 addition & 1 deletion release/macos/build_installer_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions release/macos/build_package_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.:
Expand All @@ -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
4 changes: 2 additions & 2 deletions release/macos/create_installer_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion release/macos/distribution.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<installer-script minSpecVersion="1.000000">
<title>peptdeep 1.2.1</title>
<title>peptdeep 1.3.0</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" />
Expand Down
2 changes: 1 addition & 1 deletion release/windows/build_installer_windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion release/windows/create_installer_windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions release/windows/peptdeep_innoinstaller.iss
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down

0 comments on commit e87f2dc

Please sign in to comment.