Merge pull request #503 from jungmannlab/development

0.7.3
jungmannlab · Oct 3, 2024 · 14ce66c · 14ce66c
2 parents 3039916 + 883e9f1
commit 14ce66c
Show file tree

Hide file tree

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

diff --git a/changelog.rst b/changelog.rst
@@ -1,9 +1,9 @@
 Changelog
 =========
 
-Last change: 19-SEP-2024 MTS
+Last change: 02-OCT-2024 MTS
 
-0.7.1 - 0.7.2
+0.7.1 - 0.7.3
 -------------
 - SMLM clusterer in picked regions deleted
 - Show legend in Render property displayed rounded tick label values

diff --git a/distribution/picasso.iss b/distribution/picasso.iss
@@ -2,10 +2,10 @@
 AppName=Picasso
 AppPublisher=Jungmann Lab, Max Planck Institute of Biochemistry
 
-AppVersion=0.7.2
+AppVersion=0.7.3
 DefaultDirName={commonpf}\Picasso
 DefaultGroupName=Picasso
-OutputBaseFilename="Picasso-Windows-64bit-0.7.2"
+OutputBaseFilename="Picasso-Windows-64bit-0.7.3"
 ArchitecturesAllowed=x64
 ArchitecturesInstallIn64BitMode=x64
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -26,7 +26,7 @@
 # The short X.Y version
 version = ""
 # The full version, including alpha/beta/rc tags
-release = "0.7.2"
+release = "0.7.3"
 
 # -- General configuration ---------------------------------------------------
 

diff --git a/picasso/__init__.py b/picasso/__init__.py
@@ -8,7 +8,7 @@
 import os.path as _ospath
 import yaml as _yaml
 
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 
 _this_file = _ospath.abspath(__file__)
 _this_dir = _ospath.dirname(_this_file)

diff --git a/picasso/__version__.py b/picasso/__version__.py
@@ -1 +1 @@
-VERSION_NO = "0.7.2"
+VERSION_NO = "0.7.3"
diff --git a/picasso/gui/localize.py b/picasso/gui/localize.py
@@ -1924,7 +1924,7 @@ def run(self):
             if self.use_gpufit:
                 self.progressMade.emit(1, 1)
                 theta = gausslq.fit_spots_gpufit(spots)
-                em = self.camera_info["gain"] > 1
+                em = self.camera_info["Gain"] > 1
                 locs = gausslq.locs_from_fits_gpufit(
                     self.identifications, theta, self.box, em
                 )
@@ -1937,7 +1937,7 @@ def run(self):
                     )
                     time.sleep(0.2)
                 theta = gausslq.fits_from_futures(fs)
-                em = self.camera_info["gain"] > 1
+                em = self.camera_info["Gain"] > 1
                 locs = gausslq.locs_from_fits(self.identifications, theta, self.box, em)
         elif self.method == "mle":
             curr, thetas, CRLBs, llhoods, iterations = gaussmle.gaussmle_async(
@@ -1963,7 +1963,7 @@ def run(self):
                 self.progressMade.emit(round(N * lib.n_futures_done(fs) / n_tasks), N)
                 time.sleep(0.2)
             theta = avgroi.fits_from_futures(fs)
-            em = self.camera_info["gain"] > 1
+            em = self.camera_info["Gain"] > 1
             locs = avgroi.locs_from_fits(self.identifications, theta, self.box, em)
         else:
             print("This should never happen...")

diff --git a/release/one_click_windows_gui/create_installer_windows.bat b/release/one_click_windows_gui/create_installer_windows.bat
@@ -11,9 +11,9 @@ call conda activate picasso_installer
 call python setup.py sdist bdist_wheel
 
 call cd release/one_click_windows_gui
-call pip install "../../dist/picassosr-0.7.2-py3-none-any.whl"
+call pip install "../../dist/picassosr-0.7.3-py3-none-any.whl"
 
-call pip install pyinstaller==5.7
+call pip install pyinstaller==5.12
 call pyinstaller ../pyinstaller/picasso.spec -y --clean
 call pyinstaller ../pyinstaller/picassow.spec -y --clean
 call conda deactivate

diff --git a/release/one_click_windows_gui/picasso_innoinstaller.iss b/release/one_click_windows_gui/picasso_innoinstaller.iss
@@ -1,10 +1,10 @@
 [Setup]
 AppName=Picasso
 AppPublisher=Jungmann Lab, Max Planck Institute of Biochemistry
-AppVersion=0.7.2
+AppVersion=0.7.3
 DefaultDirName={commonpf}\Picasso
 DefaultGroupName=Picasso
-OutputBaseFilename="Picasso-Windows-64bit-0.7.2"
+OutputBaseFilename="Picasso-Windows-64bit-0.7.3"
 ArchitecturesAllowed=x64
 ArchitecturesInstallIn64BitMode=x64
 

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
     name="picassosr",
-    version="0.7.2",
+    version="0.7.3",
     author="Joerg Schnitzbauer, Maximilian T. Strauss, Rafal Kowalewski",
     author_email=("[email protected], [email protected], [email protected]"),
     url="https://github.com/jungmannlab/picasso",