Merge pull request #45 from MannLabs/develop

Develop

alphamap/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.8"
+__version__ = "0.1.10"

misc/bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.9
+current_version = 0.1.10
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?

misc/one_click_macos/Info.plist

@@ -9,9 +9,9 @@
 	<key>CFBundleIconFile</key>
 	<string>alpha_logo.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>alphamap.0.1.9</string>
+	<string>alphamap.0.1.10</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.9</string>
+	<string>0.1.10</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

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

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>AlphaMap 0.1.9</title>
+    <title>AlphaMap 0.1.10</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" />

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"

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

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

settings.ini

@@ -13,7 +13,7 @@ user = ibludau
 # author_email = email@example.com
 copyright = Mann Labs
 branch = master
-version = 0.1.8
+version = 0.1.10
 min_python = 3.8
 audience = Developers
 language = English