Merge remote-tracking branch 'origin/main' into development

# Conflicts: # alphastats/DataSet_Preprocess.py # alphastats/DataSet_Statistics.py # alphastats/plots/VolcanoPlot.py # alphastats/statistics/DifferentialExpressionAnalysis.py # release/macos/create_installer_macos.sh
MannLabs · Sep 21, 2024 · 7308dc4 · 7308dc4
2 parents 6222756 + d30206a
commit 7308dc4
Show file tree

Hide file tree

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

diff --git a/.github/release.yml b/.github/release.yml
@@ -0,0 +1,20 @@
+# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuring-automatically-generated-release-notes
+changelog:
+  exclude:
+#    labels:
+#      - ignore-for-release
+    authors:
+      - octocat
+  categories:
+    - title: Breaking Changes
+      labels:
+        - breaking-change
+    - title: Bug fixes
+      labels:
+        - bug
+    - title: New Features
+      labels:
+        - enhancement
+    - title: Other Changes / unlabeled
+      labels:
+        - "*"
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
@@ -0,0 +1,24 @@
+# Create a draft release and build and upload all installers to it.
+name: Create Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      commitish_to_release:
+        type: string
+        description: 'Enter commit hash or branch to release (default: main).'
+        default: "main"
+
+jobs:
+  create-release:
+    uses: MannLabs/alphashared/.github/workflows/create_release.yml@v1
+    secrets: inherit
+    permissions:
+      contents: write
+    with:
+      package_name: alphastats
+      commitish_to_release: ${{ inputs.commitish_to_release }}
+      build_nodejs_ui: false
+      test_app: false
+      skip_macos_arm64_build: true
+      python_version: "3.10"
diff --git a/alphastats/__init__.py b/alphastats/__init__.py
@@ -1,5 +1,5 @@
 __project__ = "alphastats"
-__version__ = "0.6.7"
+__version__ = "0.6.9"
 __license__ = "Apache"
 __description__ = "An open-source Python package for Mass Spectrometry Analysis"
 __author__ = "Mann Labs"

diff --git a/docs/conf.py b/docs/conf.py
@@ -23,7 +23,7 @@
 author = "Elena Krismer"
 
 # The full version, including alpha/beta/rc tags
-release = "0.6.7"
+release = "0.6.9"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/release/linux/control b/release/linux/control
@@ -1,5 +1,5 @@
 Package: alphastats
-Version: 0.6.7
+Version: 0.6.9
 Architecture: all
 Maintainer: MannLabs
 Description: alphastats

diff --git a/release/linux/create_installer_linux.sh b/release/linux/create_installer_linux.sh
@@ -18,7 +18,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/alphastats-0.6.7-py3-none-any.whl"
+pip install "../../dist/alphastats-0.6.9-py3-none-any.whl"
 
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller==5.8

diff --git a/release/macos/Info.plist b/release/macos/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string>alphapeptstats_logo.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>alphastats.0.6.7</string>
+	<string>alphastats.0.6.9</string>
 	<key>CFBundleShortVersionString</key>
 	<string>0.6.0</string>
 	<key>CFBundleInfoDictionaryVersion</key>

diff --git 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/alphastats-0.6.7-py3-none-any.whl"
+pip install "../../dist/alphastats-0.6.9-py3-none-any.whl"
 
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller==5.8

diff --git a/release/macos/distribution.xml b/release/macos/distribution.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <installer-script minSpecVersion="1.000000">
-    <title>AlphaPeptStats 0.6.7</title>
+    <title>AlphaPeptStats 0.6.9</title>
     <background mime-type="image/png" file="alphapeptstats_logo.png" scaling="proportional"/>
     <welcome file="welcome.html" mime-type="text/html" />
     <conclusion file="conclusion.html" mime-type="text/html" />

diff --git a/release/windows/alphastats_innoinstaller.iss b/release/windows/alphastats_innoinstaller.iss
@@ -5,7 +5,7 @@
 ; so all paths are given relative to the location of this .iss file.
 
 #define MyAppName "AlphaPeptStats"
-#define MyAppVersion "0.6.7"
+#define MyAppVersion "0.6.9"
 #define MyAppPublisher "MannLabs"
 #define MyAppURL "https://github.com/MannLabs/alphapeptstats"
 #define MyAppExeName "alphastats_gui.exe"

diff --git a/release/windows/create_installer_windows.sh b/release/windows/create_installer_windows.sh
@@ -19,7 +19,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/alphastats-0.6.7-py3-none-any.whl"
+pip install "../../dist/alphastats-0.6.9-py3-none-any.whl"
 
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller==5.8

diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@ def create_pip_wheel():
     requirements = get_requirements()
     setuptools.setup(
         name="alphastats",
-        version="0.6.7",
+        version="0.6.9",
         license="Apache",
         description="An open-source Python package for automated and scalable statistical analysis of mass spectrometry-based proteomics",
         long_description=get_long_description(),