Merge pull request #224 from MannLabs/develop

Develop
MannLabs · Sep 14, 2022 · 35e7a54 · 35e7a54
2 parents 4c51435 + 7e86e6e
commit 35e7a54
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 20 deletions.
diff --git a/.github/workflows/publish_and_release.yml b/.github/workflows/publish_and_release.yml
@@ -167,13 +167,15 @@ jobs:
       - name: Prepare distribution
         shell: bash -l {0}
         run: |
-          conda env create --force --name alphatims --file misc/conda_development_environment.yaml
-          conda activate alphatims
-          rm -rf dist
-          rm -rf build
-          python setup.py sdist bdist_wheel
-          twine check dist/*
-          conda deactivate
+          # conda env create --force --name alphatims --file misc/conda_development_environment.yaml
+          # conda activate alphatims
+          # rm -rf dist
+          # rm -rf build
+          # python setup.py sdist bdist_wheel
+          # twine check dist/*
+          # conda deactivate
+          cd misc
+          . ./prepare_pypi_wheel.sh
       - name: Publish distribution to Test PyPI
         uses: pypa/gh-action-pypi-publish@master
         with:

diff --git a/alphatims/__init__.py b/alphatims/__init__.py
@@ -2,7 +2,7 @@
 
 
 __project__ = "alphatims"
-__version__ = "1.0.1"
+__version__ = "1.0.2"
 __license__ = "Apache"
 __description__ = "A Python package to index Bruker TimsTOF raw data for fast and easy accession and visualization"
 __author__ = "Sander Willems, Eugenia Voytik"

diff --git a/misc/bumpversion.cfg b/misc/bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.1
+current_version = 1.0.2
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?

diff --git a/misc/one_click_linux/control b/misc/one_click_linux/control
@@ -1,5 +1,5 @@
 Package: AlphaTims
-Version: 1.0.1
+Version: 1.0.2
 Architecture: all
 Maintainer: Mann Labs <opensource@alphapept.com>
 Description: AlphaTims GUI

diff --git a/misc/one_click_linux/create_installer_linux.sh b/misc/one_click_linux/create_installer_linux.sh
@@ -12,7 +12,7 @@ rm -rf dist
 rm -rf build
 python setup.py sdist bdist_wheel
 cd misc/one_click_linux
-pip install "../../dist/alphatims-1.0.1-py3-none-any.whl[plotting-stable,stable,legacy-stable]"
+pip install "../../dist/alphatims-1.0.2-py3-none-any.whl[plotting-stable,stable,legacy-stable]"
 pip install pyinstaller==4.10
 pyinstaller ../pyinstaller/alphatims.spec -y
 conda deactivate

diff --git a/misc/one_click_macos/Info.plist b/misc/one_click_macos/Info.plist
@@ -9,9 +9,9 @@
 	<key>CFBundleIconFile</key>
 	<string>alpha_logo.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>alphatims.1.0.1</string>
+	<string>alphatims.1.0.2</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/misc/one_click_macos/create_installer_macos.sh b/misc/one_click_macos/create_installer_macos.sh
@@ -17,7 +17,7 @@ rm -rf build
 python setup.py sdist bdist_wheel
 cd misc/one_click_macos
 pip install pyinstaller==4.10
-pip install "../../dist/alphatims-1.0.1-py3-none-any.whl[plotting-stable,stable,legacy-stable]"
+pip install "../../dist/alphatims-1.0.2-py3-none-any.whl[plotting-stable,stable,legacy-stable]"
 conda list
 pyinstaller ../pyinstaller/alphatims.spec -y
 conda deactivate
@@ -34,7 +34,7 @@ if false; then
   # https://scriptingosx.com/2019/09/notarize-a-command-line-tool/
   for f in $(find dist/alphatims -name '*.so' -or -name '*.dylib'); do codesign --sign "Developer ID Application: Max-Planck-Gesellschaft zur Förderung der Wissenschaften e.V. (7QSY5527AQ)" $f; done
   codesign --sign "Developer ID Application: Max-Planck-Gesellschaft zur Förderung der Wissenschaften e.V. (7QSY5527AQ)" dist/alphatims/Contents/MacOS/alphatims_gui --force --options=runtime --entitlements entitlements.xml
-  pkgbuild --root dist/alphatims --identifier de.mpg.biochem.alphatims.app --version 1.0.1 --install-location /Applications/AlphaTims.app --scripts scripts alphatims.pkg --sign "Developer ID Installer: Max-Planck-Gesellschaft zur Förderung der Wissenschaften e.V. (7QSY5527AQ)"
+  pkgbuild --root dist/alphatims --identifier de.mpg.biochem.alphatims.app --version 1.0.2 --install-location /Applications/AlphaTims.app --scripts scripts alphatims.pkg --sign "Developer ID Installer: Max-Planck-Gesellschaft zur Förderung der Wissenschaften e.V. (7QSY5527AQ)"
   productbuild --distribution distribution.xml --resources Resources --package-path alphatims.pkg dist/alphatims_gui_installer_macos.pkg --sign "Developer ID Installer: Max-Planck-Gesellschaft zur Förderung der Wissenschaften e.V. (7QSY5527AQ)"
   requestUUID=$(xcrun altool --notarize-app --primary-bundle-id "de.mpg.biochem.alphatims.app" --username "willems@biochem.mpg.de" --password "@keychain:Alphatims-develop" --asc-provider 7QSY5527AQ --file dist/alphatims_gui_installer_macos.pkg 2>&1 | awk '/RequestUUID/ { print $NF; }')
   request_status="in progress"
@@ -46,6 +46,6 @@ if false; then
   xcrun altool --notarization-info "$requestUUID" --username "willems@biochem.mpg.de" --password "@keychain:Alphatims-develop"
   xcrun stapler staple dist/alphatims_gui_installer_macos.pkg
 else
-  pkgbuild --root dist/alphatims --identifier de.mpg.biochem.alphatims.app --version 1.0.1 --install-location /Applications/AlphaTims.app --scripts scripts alphatims.pkg
+  pkgbuild --root dist/alphatims --identifier de.mpg.biochem.alphatims.app --version 1.0.2 --install-location /Applications/AlphaTims.app --scripts scripts alphatims.pkg
   productbuild --distribution distribution.xml --resources Resources --package-path alphatims.pkg dist/alphatims_gui_installer_macos.pkg
 fi
diff --git a/misc/one_click_macos/distribution.xml b/misc/one_click_macos/distribution.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <installer-script minSpecVersion="1.000000">
-    <title>AlphaTims 1.0.1</title>
+    <title>AlphaTims 1.0.2</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" />

diff --git a/misc/one_click_windows/alphatims_innoinstaller.iss b/misc/one_click_windows/alphatims_innoinstaller.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "AlphaTims"
-#define MyAppVersion "1.0.1"
+#define MyAppVersion "1.0.2"
 #define MyAppPublisher "Max Planck Institute of Biochemistry, Mann department"
 #define MyAppURL "https://github.com/MannLabs/alphatims"
 #define MyAppExeName "alphatims_gui.exe"

diff --git a/misc/one_click_windows/create_installer_windows.bat b/misc/one_click_windows/create_installer_windows.bat
@@ -15,7 +15,7 @@ call rmdir dist /s /q
 call rmdir build /s /q
 call python setup.py sdist bdist_wheel
 call cd misc/one_click_windows
-call pip install "../../dist/alphatims-1.0.1-py3-none-any.whl[plotting-stable,stable,legacy-stable]"
+call pip install "../../dist/alphatims-1.0.2-py3-none-any.whl[plotting-stable,stable,legacy-stable]"
 call pip install pyinstaller==4.10
 call pyinstaller ../pyinstaller/alphatims.spec -y
 call conda deactivate

diff --git a/misc/one_click_windows/create_installer_windows.sh b/misc/one_click_windows/create_installer_windows.sh
@@ -7,7 +7,7 @@ rm -rf dist
 rm -rf build
 python setup.py sdist bdist_wheel
 cd misc/one_click_windows
-pip install "../../dist/alphatims-1.0.1-py3-none-any.whl[plotting-stable,stable,legacy-stable]"
+pip install "../../dist/alphatims-1.0.2-py3-none-any.whl[plotting-stable,stable,legacy-stable]"
 pip install pyinstaller==4.10
 # TODO https://stackoverflow.com/questions/54175042/python-3-7-anaconda-environment-import-ssl-dll-load-fail-error/60405693#60405693
 pyinstaller ../pyinstaller/alphatims.spec -y

diff --git a/misc/prepare_pypi_wheel.sh b/misc/prepare_pypi_wheel.sh
@@ -0,0 +1,9 @@
+cd ..
+conda create -n alphatims_pypi_wheel python=3.8
+conda activate alphatims_pypi_wheel
+pip install twine
+rm -rf dist
+rm -rf build
+python setup.py sdist bdist_wheel
+twine check dist/*
+conda deactivate