diff --git a/alphamap/__init__.py b/alphamap/__init__.py index c11f861..569b121 100644 --- a/alphamap/__init__.py +++ b/alphamap/__init__.py @@ -1 +1 @@ -__version__ = "0.1.9" +__version__ = "0.1.10" diff --git a/misc/bumpversion.cfg b/misc/bumpversion.cfg index 975ae44..9b5feb8 100644 --- a/misc/bumpversion.cfg +++ b/misc/bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.9 +current_version = 0.1.10 commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? diff --git a/misc/one_click_macos/Info.plist b/misc/one_click_macos/Info.plist index e1e25a3..43ec467 100644 --- a/misc/one_click_macos/Info.plist +++ b/misc/one_click_macos/Info.plist @@ -9,9 +9,9 @@ CFBundleIconFile alpha_logo.icns CFBundleIdentifier - alphamap.0.1.9 + alphamap.0.1.10 CFBundleShortVersionString - 0.1.9 + 0.1.10 CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/misc/one_click_macos/create_installer_macos.sh b/misc/one_click_macos/create_installer_macos.sh index 7d61a95..3c24190 100644 --- 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.2 -pip install "../../dist/alphamap-0.1.9-py3-none-any.whl" +pip install "../../dist/alphamap-0.1.10-py3-none-any.whl" conda list pyinstaller ../pyinstaller/alphamap.spec -y conda deactivate @@ -37,7 +37,7 @@ if false; then for f in $(find dist/alphamap -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/alphamap/Contents/MacOS/alphamap_gui --force --options=runtime --entitlements entitlements.xml codesign --sign "Developer ID Application: Max-Planck-Gesellschaft zur Förderung der Wissenschaften e.V. (7QSY5527AQ)" dist/alphamap/Contents/MacOS/kaleido/executable/bin/kaleido --force --options=runtime --entitlements entitlements.xml - pkgbuild --root dist/alphamap --identifier de.mpg.biochem.alphamap.app --version 0.1.9 --install-location /Applications/AlphaMap.app --scripts scripts alphamap.pkg --sign "Developer ID Installer: Max-Planck-Gesellschaft zur Förderung der Wissenschaften e.V. (7QSY5527AQ)" + pkgbuild --root dist/alphamap --identifier de.mpg.biochem.alphamap.app --version 0.1.10 --install-location /Applications/AlphaMap.app --scripts scripts alphamap.pkg --sign "Developer ID Installer: Max-Planck-Gesellschaft zur Förderung der Wissenschaften e.V. (7QSY5527AQ)" productbuild --distribution distribution.xml --resources Resources --package-path alphamap.pkg dist/alphamap_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.alphamap.app" --username "willems@biochem.mpg.de" --password "@keychain:Alphatims-develop" --asc-provider 7QSY5527AQ --file dist/alphamap_gui_installer_macos.pkg 2>&1 | awk '/RequestUUID/ { print $NF; }') request_status="in progress" @@ -49,6 +49,6 @@ if false; then xcrun altool --notarization-info "$requestUUID" --username "willems@biochem.mpg.de" --password "@keychain:Alphatims-develop" xcrun stapler staple dist/alphamap_gui_installer_macos.pkg else - pkgbuild --root dist/alphamap --identifier de.mpg.biochem.alphamap.app --version 0.1.9 --install-location /Applications/AlphaMap.app --scripts scripts alphamap.pkg + pkgbuild --root dist/alphamap --identifier de.mpg.biochem.alphamap.app --version 0.1.10 --install-location /Applications/AlphaMap.app --scripts scripts alphamap.pkg productbuild --distribution distribution.xml --resources Resources --package-path alphamap.pkg dist/alphamap_gui_installer_macos.pkg fi diff --git a/misc/one_click_macos/distribution.xml b/misc/one_click_macos/distribution.xml index 512d133..bcd9bf2 100755 --- a/misc/one_click_macos/distribution.xml +++ b/misc/one_click_macos/distribution.xml @@ -1,6 +1,6 @@ - AlphaMap 0.1.9 + AlphaMap 0.1.10 diff --git a/misc/one_click_windows/alphamap_innoinstaller.iss b/misc/one_click_windows/alphamap_innoinstaller.iss index 034b643..eb56f42 100644 --- a/misc/one_click_windows/alphamap_innoinstaller.iss +++ b/misc/one_click_windows/alphamap_innoinstaller.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "AlphaMap" -#define MyAppVersion "0.1.9" +#define MyAppVersion "0.1.10" #define MyAppPublisher "Max Planck Institute of Biochemistry, Mann department" #define MyAppURL "https://github.com/MannLabs/alphamap" #define MyAppExeName "alphamap_gui.exe" diff --git a/misc/one_click_windows/create_installer_windows.bat b/misc/one_click_windows/create_installer_windows.bat index c9b22d8..47d7c3c 100644 --- 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/alphamap-0.1.9-py3-none-any.whl" +call pip install "../../dist/alphamap-0.1.10-py3-none-any.whl" call pip install pyinstaller==4.2 call pyinstaller ../pyinstaller/alphamap.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 index 5c95ea7..6a7b7e7 100644 --- 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/alphamap-0.1.9-py3-none-any.whl" +pip install "../../dist/alphamap-0.1.10-py3-none-any.whl" pip install pyinstaller==4.2 # TODO https://stackoverflow.com/questions/54175042/python-3-7-anaconda-environment-import-ssl-dll-load-fail-error/60405693#60405693 pyinstaller ../pyinstaller/alphamap.spec -y diff --git a/settings.ini b/settings.ini index 655ba5d..f3022df 100644 --- a/settings.ini +++ b/settings.ini @@ -13,7 +13,7 @@ user = ibludau # author_email = email@example.com copyright = Mann Labs branch = master -version = 0.1.9 +version = 0.1.10 min_python = 3.8 audience = Developers language = English