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.

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

Development #425

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.6.6
current_version = 0.6.7
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 .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python 3.10
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: 3.10.13
- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions changelog.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Changelog
=========

Last change: 05-DEC-2023 MTS
Last change: 10-JAN-2024 MTS

0.6.6
-----
0.6.6 - 0.6.7
-------------
- 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)
Expand Down
4 changes: 2 additions & 2 deletions distribution/picasso.iss
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.6.6
AppVersion=0.6.7
DefaultDirName={commonpf}\Picasso
DefaultGroupName=Picasso
OutputBaseFilename="Picasso-Windows-64bit-0.6.6"
OutputBaseFilename="Picasso-Windows-64bit-0.6.7"
ArchitecturesAllowed=x64
ArchitecturesInstallIn64BitMode=x64

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
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.6.6"
release = "0.6.7"

# -- General configuration ---------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion picasso/__init__.py
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.6.6"
__version__ = "0.6.7"

_this_file = _ospath.abspath(__file__)
_this_dir = _ospath.dirname(_this_file)
Expand Down
2 changes: 1 addition & 1 deletion picasso/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION_NO = "0.6.6"
VERSION_NO = "0.6.7"
2 changes: 1 addition & 1 deletion release/one_click_windows_gui/create_installer_windows.bat
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.6.6-py3-none-any.whl"
call pip install "../../dist/picassosr-0.6.7-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
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.6.6
AppVersion=0.6.7
DefaultDirName={commonpf}\Picasso
DefaultGroupName=Picasso
OutputBaseFilename="Picasso-Windows-64bit-0.6.6"
OutputBaseFilename="Picasso-Windows-64bit-0.6.7"
ArchitecturesAllowed=x64
ArchitecturesInstallIn64BitMode=x64

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ scikit-learn==1.3.1
tqdm==4.66.1
lmfit==1.2.2
streamlit==1.27.0
imageio==2.33.1
moviepy==1.0.3
nd2==0.7.2
sqlalchemy==2.0.21
plotly-express==0.4.1
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

setup(
name="picassosr",
version="0.6.6",
version="0.6.7",
author="Joerg Schnitzbauer, Maximilian T. Strauss, Rafal Kowalewski",
author_email=("[email protected], [email protected], [email protected]"),
url="https://github.com/jungmannlab/picasso",
Expand Down