Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.7.2 #500

Merged
merged 3 commits into from
Sep 19, 2024
Merged

v0.7.2 #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab4c719
pyimariswriter correct version
rafalkowalewski1 Sep 19, 2024
8c9e3d8
Bump version: 0.7.1 → 0.7.2
rafalkowalewski1 Sep 19, 2024
43a8c2a
Merge pull request #499 from rafalkowalewski1/development
rafalkowalewski1 Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.7.1
current_version = 0.7.2
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?
Expand Down
4 changes: 2 additions & 2 deletions changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions distribution/picasso.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion picasso/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion picasso/__version__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION_NO = "0.7.1"
VERSION_NO = "0.7.2"
2 changes: 1 addition & 1 deletion release/one_click_windows_gui/create_installer_windows.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions release/one_click_windows_gui/picasso_innoinstaller.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=("[email protected], [email protected], [email protected]"),
url="https://github.com/jungmannlab/picasso",
Expand All @@ -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",
Expand Down
Loading