Skip to content

Commit

Permalink
Merge pull request #342 from MannLabs/bump_to_1.8.0
Browse files Browse the repository at this point in the history
bump version to 1.8.0
  • Loading branch information
GeorgWa authored Sep 11, 2024
2 parents de49b33 + 90912b9 commit e4c6a33
Show file tree
Hide file tree
Showing 17 changed files with 25 additions and 26 deletions.
2 changes: 1 addition & 1 deletion alphadia/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!python

__version__ = "1.7.2"
__version__ = "1.8.0"
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# AlphaDIA Documentation
**Version:** 1.7.2 | [Github](https://github.com/MannLabs/alphadia)
**Version:** 1.8.0 | [Github](https://github.com/MannLabs/alphadia)

Open-source DIA search engine built with the alphaX ecosystem. Built with [alpharaw](https://github.com/MannLabs/alpharaw) and [alphatims](https://github.com/MannLabs/alphatims) for raw file acces. Spectral libraries are predicted with [peptdeep](https://github.com/MannLabs/alphapeptdeep) and managed by [alphabase](https://github.com/MannLabs/alphabase). Quantification is powered by [directLFQ](https://github.com/MannLabs/directLFQ).

Expand Down
2 changes: 1 addition & 1 deletion gui/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "alphadia",
"productName": "alphadia-gui",
"version": "1.7.2",
"version": "1.8.0",
"description": "Graphical user interface for DIA data analysis",
"main": "dist/electron.js",
"homepage": "./",
Expand Down
2 changes: 1 addition & 1 deletion gui/src/main/modules/profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const path = require("path")
const { app, shell, BrowserWindow} = require("electron")
const { dialog } = require('electron')

const VERSION = "1.7.2"
const VERSION = "1.8.0"

const Profile = class {

Expand Down
13 changes: 6 additions & 7 deletions misc/.bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[bumpversion]
current_version = 1.7.2
current_version = 1.8.0
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?
serialize =
serialize =
{major}.{minor}.{patch}
{major}.{minor}.{patch}

Expand All @@ -29,19 +29,18 @@ serialize =

[bumpversion:file:../release/macos/build_package_macos.sh]

[bumpversion:file:../release/macos/build_backend_macos.sh] # TODO remove with old release workflow
[bumpversion:file:../release/macos/build_backend_macos.sh]

[bumpversion:file:../release/macos/build_pkg_macos.sh] # TODO remove with old release workflow
[bumpversion:file:../release/macos/build_pkg_macos.sh]

[bumpversion:file:../release/macos/distribution.xml]

[bumpversion:file:../release/windows/alphadia_innoinstaller.iss]

[bumpversion:file:../release/windows/alphadia_innoinstaller_old.iss] # TODO remove with old release workflow
[bumpversion:file:../release/windows/alphadia_innoinstaller_old.iss]

[bumpversion:file:../release/windows/build_installer_windows.ps1]

[bumpversion:file:../release/windows/build_backend.ps1] # TODO remove with old release workflow

[bumpversion:file:../release/windows/build_backend.ps1]
search = {current_version}
replace = {new_version}
2 changes: 1 addition & 1 deletion release/linux/build_installer_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ rm -rf dist build *.egg-info
rm -rf dist_pyinstaller build_pyinstaller

python -m build
pip install "dist/alphadia-1.7.2-py3-none-any.whl[stable]"
pip install "dist/alphadia-1.8.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/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: alphadia
Version: 1.7.2
Version: 1.8.0
Architecture: all
Maintainer: Mann Labs <[email protected]>
Description: alphadia
Expand Down
2 changes: 1 addition & 1 deletion release/macos/build_backend_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# navigate to the root directory

python -m build
pip install "dist/alphadia-1.7.2-py3-none-any.whl[stable]"
pip install "dist/alphadia-1.8.0-py3-none-any.whl[stable]"

# Creating the stand-alone pyinstaller folder
pip install pyinstaller
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 @@ -10,7 +10,7 @@ rm -rf dist_pyinstaller build_pyinstaller
export EAGER_IMPORT=true # TODO check if this can be removed with newset peptdeep version w/out transformer dependenc

python -m build
pip install "dist/alphadia-1.7.2-py3-none-any.whl[stable]"
pip install "dist/alphadia-1.8.0-py3-none-any.whl[stable]"

# Creating the stand-alone pyinstaller folder
pyinstaller release/pyinstaller/alphadia.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 @@ -7,10 +7,10 @@ set -e -u
# Set up package name and version
PACKAGE_NAME="alphadia"
APP_NAME="alphadia"
PACKAGE_VERSION="1.7.2"
PACKAGE_VERSION="1.8.0"
PKG_FOLDER="dist/$APP_NAME.app"

# BUILD_NAME is taken from environment variables, e.g. alphadia-1.7.2-macos-darwin-arm64 or alphadia-1.7.2-macos-darwin-x64
# BUILD_NAME is taken from environment variables, e.g. alphadia-1.8.0-macos-darwin-arm64 or alphadia-1.8.0-macos-darwin-x64
rm -rf ${BUILD_NAME}.pkg

# Cleanup the package folder
Expand Down
2 changes: 1 addition & 1 deletion release/macos/build_pkg_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# Set up package name and version
PACKAGE_NAME="alphadia"
PACKAGE_VERSION="1.7.2"
PACKAGE_VERSION="1.8.0"

ARCH=$(uname -m)
if [ "$ARCH" == "x86_64" ]; then
Expand Down
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>AlphaDIA 1.7.2</title>
<title>AlphaDIA 1.8.0</title>
<background mime-type="image/png" file="alphadia.png" scaling="proportional"/>
<welcome file="welcome.html" mime-type="text/html" />
<conclusion file="conclusion.html" mime-type="text/html" />
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>alphadia.icns</string>
<key>CFBundleIdentifier</key>
<string>alphadia.1.7.2</string>
<string>alphadia.1.8.0</string>
<key>CFBundleShortVersionString</key>
<string>1.7.2</string>
<string>1.8.0</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
4 changes: 2 additions & 2 deletions release/windows/alphadia_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 "AlphaDIA"
#define MyAppVersion "1.7.2"
#define MyAppVersion "1.8.0"
#define MyAppPublisher "Max Planck Institute of Biochemistry, Mann Labs"
#define MyAppURL "https://github.com/MannLabs/alphadia"
#define MyAppExeName "alphadia-gui.exe"
Expand All @@ -29,7 +29,7 @@ PrivilegesRequired=lowest
PrivilegesRequiredOverridesAllowed=dialog
; release workflow expects artifact at root of repository
OutputDir=..\..\
; example for BUILD_NAME: alphadia-1.7.2-win-x64
; example for BUILD_NAME: alphadia-1.8.0-win-x64
OutputBaseFilename={#GetEnv('BUILD_NAME')}
SetupIconFile=..\logos\alphadia.ico
Compression=lzma
Expand Down
2 changes: 1 addition & 1 deletion release/windows/alphadia_innoinstaller_old.iss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
; # TODO remove with old release workflow

#define MyAppName "AlphaDIA"
#define MyAppVersion "1.7.2"
#define MyAppVersion "1.8.0"
#define MyAppPublisher "Max Planck Institute of Biochemistry, Mann Labs"
#define MyAppURL "https://github.com/MannLabs/alphadia"
#define MyAppExeName "alphadia-gui.exe"
Expand Down
2 changes: 1 addition & 1 deletion release/windows/build_backend.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Remove-Item -Recurse -Force -ErrorAction SilentlyContinue ./dist

pip install build
python -m build
pip install "dist/alphadia-1.7.2-py3-none-any.whl[stable]"
pip install "dist/alphadia-1.8.0-py3-none-any.whl[stable]"

# Creating the stand-alone pyinstaller folder
pip install pyinstaller tbb
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 @@ -5,7 +5,7 @@ Remove-Item -Recurse -Force -ErrorAction SilentlyContinue ./build
Remove-Item -Recurse -Force -ErrorAction SilentlyContinue ./dist

python -m build
pip install "dist/alphadia-1.7.2-py3-none-any.whl[stable]"
pip install "dist/alphadia-1.8.0-py3-none-any.whl[stable]"

# Creating the stand-alone pyinstaller folder
pip install tbb==2021.13.1
Expand Down

0 comments on commit e4c6a33

Please sign in to comment.