From deab0c6e31c544fc56d1e4d0ccc8e00348dcae92 Mon Sep 17 00:00:00 2001 From: rafalkowalewski1 Date: Tue, 7 Nov 2023 14:16:46 +0100 Subject: [PATCH 1/8] Update installation instructions for dev; clean code --- changelog.rst | 5 +++-- picasso/__init__.py | 2 +- picasso/clusterer.py | 11 ++++++----- picasso/gui/rotation.py | 2 +- picasso/postprocess.py | 4 ++-- readme.rst | 27 +++++---------------------- 6 files changed, 18 insertions(+), 33 deletions(-) diff --git a/changelog.rst b/changelog.rst index 143f53ee..22c1dba1 100644 --- a/changelog.rst +++ b/changelog.rst @@ -1,9 +1,9 @@ Changelog ========= -Last change: 22-OCT-2023 MTS +Last change: 07-NOV-2023 MTS -0.6.3 - 0.6.5 +0.6.3 - 0.6.6 ------------- - Dependencies updated - Bug fixes due to Python 3.10 and PyQt5 (listed below) @@ -14,6 +14,7 @@ Last change: 22-OCT-2023 MTS - Fix test clusterer HDBSCAN bug - Fix .nd2 localized files info loading (full loader changed to unsafe loader) - Fix rare bug with pick similar zero division error +- Update installation instructions 0.6.2 ----- diff --git a/picasso/__init__.py b/picasso/__init__.py index 66cbf5e9..d2f4c172 100644 --- a/picasso/__init__.py +++ b/picasso/__init__.py @@ -3,7 +3,7 @@ ~~~~~~~~~~~~~~~~~~~~ :authors: Joerg Schnitzbauer, Maximilian Thomas Strauss, Rafal Kowalewski 2016-2023 - :copyright: Copyright (c) 2016-2018 Jungmann Lab, MPI of Biochemistry + :copyright: Copyright (c) 2016-2023 Jungmann Lab, MPI of Biochemistry """ import os.path as _ospath import yaml as _yaml diff --git a/picasso/clusterer.py b/picasso/clusterer.py index fa1de450..bff9369a 100644 --- a/picasso/clusterer.py +++ b/picasso/clusterer.py @@ -385,14 +385,15 @@ def dbscan(locs, radius, min_density, pixelsize=None): Paramters --------- locs : np.recarray - Localizations to be clustered + Localizations to be clustered. radius : float - DBSCAN search radius, often referred to as "epsilon" + DBSCAN search radius, often referred to as "epsilon". Same units + as locs. min_density : int Number of localizations within radius to consider a given point - a core sample - pixelsize : int - Camera pixel size in nm + a core sample. + pixelsize : int (default=None) + Camera pixel size in nm. Only needed for 3D. Returns ------- diff --git a/picasso/gui/rotation.py b/picasso/gui/rotation.py index 6804f432..88460c48 100644 --- a/picasso/gui/rotation.py +++ b/picasso/gui/rotation.py @@ -2287,7 +2287,7 @@ def __init__(self, window): rotation_action.triggered.connect(self.view_rot.rotation_input) rotation_action.setShortcut("Ctrl+Shift+R") - delete_rotation_action = view_menu.addAction("Remove rotation") + delete_rotation_action = view_menu.addAction("Reset rotation") delete_rotation_action.triggered.connect(self.view_rot.delete_rotation) delete_rotation_action.setShortcut("Ctrl+Shift+W") fit_in_view_action = view_menu.addAction("Fit image to window") diff --git a/picasso/postprocess.py b/picasso/postprocess.py index 62f019d9..ceee4c77 100644 --- a/picasso/postprocess.py +++ b/picasso/postprocess.py @@ -1038,8 +1038,8 @@ def link_loc_groups(locs, info, link_group, remove_ambiguous_lengths=True): def localization_precision(photons, s, bg, em): """ - Calculates the theoretical localization precision - according to Mortensen et al., Nat Meth, 2010 + Calculates the theoretical localization precision according to + Mortensen et al., Nat Meth, 2010 for a 2D unweighted Gaussian fit. """ s2 = s**2 sa2 = s2 + 1 / 12 diff --git a/readme.rst b/readme.rst index 53e82474..99c1614f 100644 --- a/readme.rst +++ b/readme.rst @@ -53,7 +53,7 @@ Via PyPI 1. Open the console/terminal and create a new conda environment: ``conda create --name picasso python=3.10`` 2. Activate the environment: ``conda activate picasso``. 3. Install Picasso package using: ``pip install picassosr``. -4. You can now run any Picasso function directly from the console/terminal by running: ``picasso render``, ``picasso localize``, etc. +4. You can now run any Picasso function directly from the console/terminal by running: ``picasso render``, ``picasso localize``, etc, or import Picasso functions in your own Python scripts. For Developers ^^^^^^^^^^^^^^ @@ -65,19 +65,9 @@ If you wish to use your local version of Picasso with your own modifications: 3. Change to the directory of choice using ``cd``. 4. Clone this GitHub repository by running ``git clone https://github.com/jungmannlab/picasso``. Alternatively, `download `__ the zip file and unzip it. 5. Open the Picasso directory: ``cd picasso``. -6. You can modify Picasso code from here. - -*Windows* -''''''''' - -7. If you wish to create a *local* Picasso package to use it in other Python scripts (that includes your changes), run ``python setup.py install``. -8. You can now run any Picasso function directly from the console/terminal by running: ``picasso render``, ``picasso localize``, etc. -9. Remember that in order to update changes in Picasso code, you need to repeat step 7. - -*Mac* -''''' - -Currently, Picasso does not support package creation on Mac OS. If you wish to run your modified Picasso code, simply go to your ``picasso`` directory and run ``python -m picasso render``, ``python -m picasso localize``, etc. +6. You can modify Picasso code in this directory. +7. To create a *local* Picasso package to use it in other Python scripts, run ``pip install -e .``. When you change the code in the ``picasso`` directory, the changes will be reflected in the package. +8. You can now run any Picasso function directly from the console/terminal by running: ``picasso render``, ``picasso localize``, etc, or import Picasso functions in your own Python scripts. Optional packages ^^^^^^^^^^^^^^^^^ @@ -96,13 +86,6 @@ If Picasso was installed from PyPI, run the following command: ``pip install --upgrade picassosr`` -If Picasso was cloned from the GitHub repository, use the following commands: - -1. Move to the ``picasso`` folder with the terminal, activate environment. -2. Update with git: ``git pull``. -3. Update the environment: ``pip install --upgrade -r requirements.txt``. -4. (*Windows only*)Run installation ``python setup.py install``. - Creating shortcuts on Windows (*optional*) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -135,7 +118,7 @@ Check picasso/samples/ for Jupyter Notebooks that show how to interact with the Contributing ------------ -If you have a feature request or a bug report, please post it as an issue on the GitHub issue tracker. If you want to contribute, put a PR for it. You can find more guidelines for contributing `here `__. I will gladly guide you through the codebase and credit you accordingly. Additionally, you can check out the ``Projects``-page on GitHub. You can also contact me via picasso@jungmannlab.org. +If you have a feature request or a bug report, please post it as an issue on the GitHub issue tracker. If you want to contribute, put a PR for it. You can find more guidelines for contributing `here `__. We will gladly guide you through the codebase and credit you accordingly. Additionally, you can check out the ``Projects``-page on GitHub. You can also contact us via picasso@jungmannlab.org. Contributions & Copyright ------------------------- From e9f39bc2057c17e2587b6079c3b920c62460dc60 Mon Sep 17 00:00:00 2001 From: rafalkowalewski1 Date: Tue, 7 Nov 2023 15:15:11 +0100 Subject: [PATCH 2/8] add reqs for documentation (readthedocs) --- .readthedocs.yaml | 8 ++++---- changelog.rst | 1 + docs/requirements.txt | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 docs/requirements.txt diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 29ae4e81..8356d0be 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -26,7 +26,7 @@ sphinx: # Optional but recommended, declare the Python requirements required # to build your documentation # See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html -# python: -# install: -# - requirements: requirements.txt -# - method: pip \ No newline at end of file +python: + install: + - requirements: docs/requirements.txt + - method: pip \ No newline at end of file diff --git a/changelog.rst b/changelog.rst index 22c1dba1..07f17acc 100644 --- a/changelog.rst +++ b/changelog.rst @@ -15,6 +15,7 @@ Last change: 07-NOV-2023 MTS - Fix .nd2 localized files info loading (full loader changed to unsafe loader) - Fix rare bug with pick similar zero division error - Update installation instructions +- Added readthedocs requirements file (only for developers) 0.6.2 ----- diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 00000000..070f09d2 --- /dev/null +++ b/docs/requirements.txt @@ -0,0 +1,3 @@ +sphinx==5.3.0 +sphinx_rtd_theme==1.1.1 +readthedocs-sphinx-search==0.1.1 \ No newline at end of file From 23c3a70ac04aff5309fb8c0dc42a251e87a84646 Mon Sep 17 00:00:00 2001 From: rafalkowalewski1 Date: Tue, 5 Dec 2023 10:19:50 +0100 Subject: [PATCH 3/8] No blur while padding, Render --- changelog.rst | 3 ++- picasso/gui/render.py | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/changelog.rst b/changelog.rst index 07f17acc..54989205 100644 --- a/changelog.rst +++ b/changelog.rst @@ -1,7 +1,7 @@ Changelog ========= -Last change: 07-NOV-2023 MTS +Last change: 05-DEC-2023 MTS 0.6.3 - 0.6.6 ------------- @@ -16,6 +16,7 @@ Last change: 07-NOV-2023 MTS - Fix rare bug with pick similar zero division error - Update installation instructions - Added readthedocs requirements file (only for developers) +- No blur applied when padding in Picasso: Render (increases speed of rendering) 0.6.2 ----- diff --git a/picasso/gui/render.py b/picasso/gui/render.py index de830ae4..a0d64759 100644 --- a/picasso/gui/render.py +++ b/picasso/gui/render.py @@ -7099,9 +7099,12 @@ def get_render_kwargs(self, viewport=None): """ # blur method - blur_button = ( - self.window.display_settings_dlg.blur_buttongroup.checkedButton() - ) + if self._pan: # no blur when panning + blur_method = None + else: # selected method + blur_method = self.window.display_settings_dlg.blur_methods[ + self.window.display_settings_dlg.blur_buttongroup.checkedButton() + ] # oversampling optimal_oversampling = ( @@ -7140,9 +7143,7 @@ def get_render_kwargs(self, viewport=None): return { "oversampling": oversampling, "viewport": viewport, - "blur_method": self.window.display_settings_dlg.blur_methods[ - blur_button - ], + "blur_method": blur_method, "min_blur_width": float( self.window.display_settings_dlg.min_blur_width.value() ), @@ -7411,6 +7412,7 @@ def mouseReleaseEvent(self, event): self._pan = False self.setCursor(QtCore.Qt.ArrowCursor) event.accept() + self.update_scene() else: event.ignore() elif self._mode == "Pick": From 43996527cb727d8e74d97e9c84add78824bc98df Mon Sep 17 00:00:00 2001 From: rafalkowalewski1 Date: Mon, 11 Dec 2023 10:13:30 +0100 Subject: [PATCH 4/8] update changelog --- changelog.rst | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/changelog.rst b/changelog.rst index 54989205..4a682c8e 100644 --- a/changelog.rst +++ b/changelog.rst @@ -3,7 +3,16 @@ Changelog Last change: 05-DEC-2023 MTS -0.6.3 - 0.6.6 +0.6.6 +----- +- GUI modules display the Picasso version number in the title bar +- Added readthedocs requirements file (only for developers) +- No blur applied when padding in Picasso: Render (increases speed of rendering) +- Camera settings saved in the .yaml file after localization +- Picasso: Design has the speed optimized extension sequences (Strauss and Jungmann, Nature Methods, 2020) +- Change matplotlib backend for macOS (bug fix with some plots being unavailable) + +0.6.3 - 0.6.5 ------------- - Dependencies updated - Bug fixes due to Python 3.10 and PyQt5 (listed below) @@ -15,8 +24,6 @@ Last change: 05-DEC-2023 MTS - Fix .nd2 localized files info loading (full loader changed to unsafe loader) - Fix rare bug with pick similar zero division error - Update installation instructions -- Added readthedocs requirements file (only for developers) -- No blur applied when padding in Picasso: Render (increases speed of rendering) 0.6.2 ----- From 4214a19092904db7927af0deca2fec881322ac24 Mon Sep 17 00:00:00 2001 From: rafalkowalewski1 Date: Mon, 1 Jan 2024 13:04:18 +0100 Subject: [PATCH 5/8] CLEAN --- picasso/design_sequences.py | 2 +- picasso/gui/render.py | 2 +- readme.rst | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/picasso/design_sequences.py b/picasso/design_sequences.py index 9e11697c..df113707 100644 --- a/picasso/design_sequences.py +++ b/picasso/design_sequences.py @@ -195,5 +195,5 @@ ["7xR3", "TCCTCTCTCTCTCTCTCTCTC"], ["7xR4", "CAACACACACACACACACACA"], ["5xR5", "CCCTTCTTCTTCTTCTTCTTC"], - ["5xR6", "AAAACAACAACAACAACAACAA"] + ["5xR6", "AAAACAACAACAACAACAACAA"], ] diff --git a/picasso/gui/render.py b/picasso/gui/render.py index 96d96d52..70debd58 100644 --- a/picasso/gui/render.py +++ b/picasso/gui/render.py @@ -7009,7 +7009,7 @@ def save_channel(self, title="Choose a channel"): return None elif n_channels == 1: return 0 - elif len(self.locs_paths) > 1: + elif n_channels > 1: pathlist = list(self.locs_paths) pathlist.append("Apply to all sequentially") pathlist.append("Combine all channels") diff --git a/readme.rst b/readme.rst index 99c1614f..1eb926d7 100644 --- a/readme.rst +++ b/readme.rst @@ -76,8 +76,7 @@ Regardless of whether Picasso was installed via PyPI or by cloning the GitHub re - ``pip install pyinstaller`` if you plan to additionally compile your own installer with `Pyinstaller `__. - *(Windows only)* ``pip install PyImarisWriter==0.7.0`` to enable .ims files in Localize and Render. Note that ``PyImarisWriter`` has been tested only on Windows. - -To enable GPU fitting, follow instructions on `Gpufit `__ to install the Gpufit python library in your conda environment. In practice, this means downloading the zipfile and installing the Python wheel. Picasso Localize will automatically import the library if present and enables a checkbox for GPU fitting when selecting the LQ-Method. +- To enable ``GPU fitting``, follow instructions on `Gpufit `__ to install the Gpufit python library in your conda environment. In practice, this means downloading the zipfile and installing the Python wheel. Picasso Localize will automatically import the library if present and enables a checkbox for GPU fitting when selecting the LQ-Method. Updating ^^^^^^^^ From c9d64b0fc558f645031066a593c9e2b209c1cc5b Mon Sep 17 00:00:00 2001 From: rafalkowalewski1 Date: Mon, 1 Jan 2024 19:58:22 +0100 Subject: [PATCH 6/8] 3d render animation build antivirus FIX --- changelog.rst | 1 + picasso/gui/rotation.py | 129 +++++++--------------------------------- requirements.txt | 2 +- 3 files changed, 25 insertions(+), 107 deletions(-) diff --git a/changelog.rst b/changelog.rst index 4a682c8e..fd78d16b 100644 --- a/changelog.rst +++ b/changelog.rst @@ -11,6 +11,7 @@ Last change: 05-DEC-2023 MTS - Camera settings saved in the .yaml file after localization - Picasso: Design has the speed optimized extension sequences (Strauss and Jungmann, Nature Methods, 2020) - Change matplotlib backend for macOS (bug fix with some plots being unavailable) +- Build animation does not trigger antivirus, which could delete Picasso (one click installer) 0.6.3 - 0.6.5 ------------- diff --git a/picasso/gui/rotation.py b/picasso/gui/rotation.py index 88460c48..96858449 100644 --- a/picasso/gui/rotation.py +++ b/picasso/gui/rotation.py @@ -12,20 +12,19 @@ import os import colorsys -import re from functools import partial import numpy as np import matplotlib.pyplot as plt -from moviepy.video.io.ImageSequenceClip import ImageSequenceClip +# from moviepy.video.io.ImageSequenceClip import ImageSequenceClip +import imageio from PyQt5 import QtCore, QtGui, QtWidgets from numpy.lib.recfunctions import stack_arrays from .. import io, render -from ..lib import StatusDialog, ProgressDialog +from ..lib import ProgressDialog -# from icecream import ic #TODO: delete DEFAULT_OVERSAMPLING = 1.0 INITIAL_REL_MAXIMUM = 0.5 @@ -33,44 +32,6 @@ SHIFT = 0.1 ZOOM = 9 / 7 -def atoi(text): - """ - Converts string to digit if it represents an integer. - - Parameters - ---------- - text : str - String to be converted - - Returns - ------- - int or str - int if text represents a digit, text otherwise - """ - - return int(text) if text.isdigit() else text - -def natural_keys(text): - """ - Splits text into three parts: - * str ending with "/frame_" - * int with frame index - * ".png" - Using this key, frames' paths can be sorted by their index - - Parameters - ---------- - text : str - String to be split and converted - - Returns - ------- - list - Text split into several parts, where strings representing - digits are converted to int - """ - - return [atoi(c) for c in re.split('([0-9]+)', text)] def get_colors(n_channels): """ @@ -651,75 +612,31 @@ def build_animation(self): if height % 2 == 1: height += 1 - # create temporary folder to store all frames - base = os.path.dirname(self.window.view_rot.paths[0]) - path = os.path.join(base, "animation_frames") + # render all frames and save in RAM + video_writer = imageio.get_writer(name, fps=self.fps.value()) progress = ProgressDialog( "Rendering frames", 0, len(angx), self.window ) progress.set_value(0) - try: - os.mkdir(path) - for i in range(len(angx)): - qimage = self.window.view_rot.render_scene( - viewport=[(ymin[i], xmin[i]), (ymax[i], xmax[i])], - ang=(angx[i], angy[i], angz[i]), - animation=True, - ) - qimage = qimage.scaled( - width, - height, - # QtCore.Qt.KeepAspectRatioByExpanding, - ) - qimage.save(path + "/frame_{}.png".format(i+1)) - progress.set_value(i+1) - except: - # if folder exists, ask if it should be used or deleted - m = QtWidgets.QMessageBox() - m.setWindowTitle("Frames already exist") - ret = m.question( - self, - "", - "Use the existing frames folder?", - m.Yes | m.No, + for i in range(len(angx)): + qimage = self.window.view_rot.render_scene( + viewport=[(ymin[i], xmin[i]), (ymax[i], xmax[i])], + ang=(angx[i], angy[i], angz[i]), + animation=True, ) - if ret == m.No: - # use new frames (render each one) and save - for file in os.listdir(path): - os.remove(os.path.join(path, file)) - for i in range(len(angx)): - qimage = self.window.view_rot.render_scene( - viewport=[(ymin[i], xmin[i]), (ymax[i], xmax[i])], - ang=(angx[i], angy[i], angz[i]), - animation=True, - ) - qimage = qimage.scaled( - width, - height, - # QtCore.Qt.KeepAspectRatioByExpanding, - ) - qimage.save(path + "/frame_{}.png".format(i+1)) - progress.set_value(i+1) - elif ret == m.Yes: - # use old frames - progress.set_value(len(angx)) - - # build a video and save it - status = StatusDialog("Creating the video...", self.window) - image_files = [ - os.path.join(path, img) - for img in os.listdir(path) - if img.endswith(".png") - ] # paths to each frame - image_files.sort(key=natural_keys) # sort frames - video = ImageSequenceClip(image_files, fps=self.fps.value()) - video.write_videofile(name, logger=None) - - # delete animation frames - for file in os.listdir(path): - os.remove(os.path.join(path, file)) - os.rmdir(path) - status.close() + qimage = qimage.scaled(width, height) + + # convert to a np.array and append + ptr = qimage.bits() + ptr.setsize(height * width * 4) + frame = np.frombuffer(ptr, np.uint8).reshape((width, height, 4)) + frame = frame[:, :, :3] + frame = frame[:, :, ::-1] # invert RGB to BGR + + video_writer.append_data(frame) + progress.set_value(i+1) + progress.close() + video_writer.close() class ViewRotation(QtWidgets.QLabel): diff --git a/requirements.txt b/requirements.txt index 686cc129..e1591aaf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ scikit-learn==1.3.1 tqdm==4.66.1 lmfit==1.2.2 streamlit==1.27.0 -moviepy==1.0.3 +imageio==2.33.1 nd2==0.7.2 sqlalchemy==2.0.21 plotly-express==0.4.1 From 550a647d215b55cef2e822808786200fc1c3fb7a Mon Sep 17 00:00:00 2001 From: rafalkowalewski1 Date: Wed, 10 Jan 2024 12:12:47 +0100 Subject: [PATCH 7/8] CLEAN --- changelog.rst | 2 +- picasso/gui/render.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog.rst b/changelog.rst index fd78d16b..757cf3ba 100644 --- a/changelog.rst +++ b/changelog.rst @@ -11,7 +11,7 @@ Last change: 05-DEC-2023 MTS - Camera settings saved in the .yaml file after localization - Picasso: Design has the speed optimized extension sequences (Strauss and Jungmann, Nature Methods, 2020) - Change matplotlib backend for macOS (bug fix with some plots being unavailable) -- Build animation does not trigger antivirus, which could delete Picasso (one click installer) +- Build animation does not trigger antivirus, which could delete Picasso (one click installer only) 0.6.3 - 0.6.5 ------------- diff --git a/picasso/gui/render.py b/picasso/gui/render.py index 70debd58..8339a256 100644 --- a/picasso/gui/render.py +++ b/picasso/gui/render.py @@ -5698,7 +5698,9 @@ def add(self, path, render=True): self.window.dataset_dialog.add_entry(path) self.window.setWindowTitle( - "Picasso: Render. File: {}".format(os.path.basename(path)) + "Picasso v{}: Render. File: {}".format( + __version__, os.path.basename(path) + ) ) # fast rendering add channel From c2beeec87c988e82d5ad3d96a7e7af10b4b02bf7 Mon Sep 17 00:00:00 2001 From: rafalkowalewski1 Date: Wed, 10 Jan 2024 12:14:15 +0100 Subject: [PATCH 8/8] =?UTF-8?q?Bump=20version:=200.6.5=20=E2=86=92=200.6.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- distribution/picasso.iss | 4 ++-- docs/conf.py | 2 +- picasso/__init__.py | 2 +- picasso/__version__.py | 2 +- release/one_click_windows_gui/create_installer_windows.bat | 2 +- release/one_click_windows_gui/picasso_innoinstaller.iss | 4 ++-- setup.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 8952a0c5..febbf7a7 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.6.5 +current_version = 0.6.6 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? diff --git a/distribution/picasso.iss b/distribution/picasso.iss index 94d64889..dd547543 100644 --- a/distribution/picasso.iss +++ b/distribution/picasso.iss @@ -2,10 +2,10 @@ AppName=Picasso AppPublisher=Jungmann Lab, Max Planck Institute of Biochemistry -AppVersion=0.6.5 +AppVersion=0.6.6 DefaultDirName={commonpf}\Picasso DefaultGroupName=Picasso -OutputBaseFilename="Picasso-Windows-64bit-0.6.5" +OutputBaseFilename="Picasso-Windows-64bit-0.6.6" ArchitecturesAllowed=x64 ArchitecturesInstallIn64BitMode=x64 diff --git a/docs/conf.py b/docs/conf.py index 7c0db319..90c3785b 100644 --- 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.6.5" +release = "0.6.6" # -- General configuration --------------------------------------------------- diff --git a/picasso/__init__.py b/picasso/__init__.py index d2f4c172..3db00cfd 100644 --- a/picasso/__init__.py +++ b/picasso/__init__.py @@ -8,7 +8,7 @@ import os.path as _ospath import yaml as _yaml -__version__ = "0.6.5" +__version__ = "0.6.6" _this_file = _ospath.abspath(__file__) _this_dir = _ospath.dirname(_this_file) diff --git a/picasso/__version__.py b/picasso/__version__.py index 7669fd0e..f2c4e63a 100644 --- a/picasso/__version__.py +++ b/picasso/__version__.py @@ -1 +1 @@ -VERSION_NO = "0.6.5" +VERSION_NO = "0.6.6" diff --git a/release/one_click_windows_gui/create_installer_windows.bat b/release/one_click_windows_gui/create_installer_windows.bat index c1c6655f..71bfd1ed 100644 --- a/release/one_click_windows_gui/create_installer_windows.bat +++ b/release/one_click_windows_gui/create_installer_windows.bat @@ -11,7 +11,7 @@ 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.6.5-py3-none-any.whl" +call pip install "../../dist/picassosr-0.6.6-py3-none-any.whl" call pip install pyinstaller==5.7 call pyinstaller ../pyinstaller/picasso.spec -y --clean diff --git a/release/one_click_windows_gui/picasso_innoinstaller.iss b/release/one_click_windows_gui/picasso_innoinstaller.iss index 0c4addf6..bb9cbed4 100644 --- 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.6.5 +AppVersion=0.6.6 DefaultDirName={commonpf}\Picasso DefaultGroupName=Picasso -OutputBaseFilename="Picasso-Windows-64bit-0.6.5" +OutputBaseFilename="Picasso-Windows-64bit-0.6.6" ArchitecturesAllowed=x64 ArchitecturesInstallIn64BitMode=x64 diff --git a/setup.py b/setup.py index 945d985d..6da0cb84 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name="picassosr", - version="0.6.5", + version="0.6.6", author="Joerg Schnitzbauer, Maximilian T. Strauss, Rafal Kowalewski", author_email=("joschnitzbauer@gmail.com, straussmaximilian@gmail.com, rafalkowalewski998@gmail.com"), url="https://github.com/jungmannlab/picasso",