diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 19375382..d905e322 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.7.1 +current_version = 0.7.2 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? diff --git a/changelog.rst b/changelog.rst index 9971ecf9..3e551a23 100644 --- a/changelog.rst +++ b/changelog.rst @@ -3,8 +3,8 @@ Changelog Last change: 19-SEP-2024 MTS -0.7.1 ------ +0.7.1 - 0.7.2 +------------- - SMLM clusterer in picked regions deleted - Show legend in Render property displayed rounded tick label values - Pick circular area does not save the area for each pick in localization's metadata diff --git a/distribution/picasso.iss b/distribution/picasso.iss index 274f8b70..78e1008b 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.7.1 +AppVersion=0.7.2 DefaultDirName={commonpf}\Picasso DefaultGroupName=Picasso -OutputBaseFilename="Picasso-Windows-64bit-0.7.1" +OutputBaseFilename="Picasso-Windows-64bit-0.7.2" ArchitecturesAllowed=x64 ArchitecturesInstallIn64BitMode=x64 diff --git a/docs/conf.py b/docs/conf.py index 46c23f44..147bb3c6 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.7.1" +release = "0.7.2" # -- General configuration --------------------------------------------------- diff --git a/picasso/__init__.py b/picasso/__init__.py index 9c73a890..dd8d0476 100644 --- a/picasso/__init__.py +++ b/picasso/__init__.py @@ -8,7 +8,7 @@ import os.path as _ospath import yaml as _yaml -__version__ = "0.7.1" +__version__ = "0.7.2" _this_file = _ospath.abspath(__file__) _this_dir = _ospath.dirname(_this_file) diff --git a/picasso/__version__.py b/picasso/__version__.py index 01d0aacc..98011931 100644 --- a/picasso/__version__.py +++ b/picasso/__version__.py @@ -1 +1 @@ -VERSION_NO = "0.7.1" +VERSION_NO = "0.7.2" diff --git a/release/one_click_windows_gui/create_installer_windows.bat b/release/one_click_windows_gui/create_installer_windows.bat index a04f1695..beaebe8b 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.7.1-py3-none-any.whl" +call pip install "../../dist/picassosr-0.7.2-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 c47c2e6e..69d1ddae 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.7.1 +AppVersion=0.7.2 DefaultDirName={commonpf}\Picasso DefaultGroupName=Picasso -OutputBaseFilename="Picasso-Windows-64bit-0.7.1" +OutputBaseFilename="Picasso-Windows-64bit-0.7.2" ArchitecturesAllowed=x64 ArchitecturesInstallIn64BitMode=x64 diff --git a/setup.py b/setup.py index 31775d1c..9898d5e1 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name="picassosr", - version="0.7.1", + version="0.7.2", 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", @@ -18,7 +18,7 @@ entry_points={ "console_scripts": ["picasso=picasso.__main__:main"], }, - install_requires=requirements + ["PyImarisWriter==0.7.1; sys_platform=='win32'"], + install_requires=requirements + ["PyImarisWriter==0.7.0; sys_platform=='win32'"], classifiers=[ "Programming Language :: Python", "Programming Language :: Python :: 3.10",