diff --git a/.bumpversion.cfg b/.bumpversion.cfg index febbf7a7..08dff284 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.6.6 +current_version = 0.6.7 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7e17ead5..c7ba5f0a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/changelog.rst b/changelog.rst index 757cf3ba..c263de4c 100644 --- a/changelog.rst +++ b/changelog.rst @@ -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) diff --git a/distribution/picasso.iss b/distribution/picasso.iss index dd547543..a0739909 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.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 diff --git a/docs/conf.py b/docs/conf.py index 90c3785b..a86242c1 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.6" +release = "0.6.7" # -- General configuration --------------------------------------------------- diff --git a/picasso/__init__.py b/picasso/__init__.py index 3db00cfd..bd113494 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.6" +__version__ = "0.6.7" _this_file = _ospath.abspath(__file__) _this_dir = _ospath.dirname(_this_file) diff --git a/picasso/__version__.py b/picasso/__version__.py index f2c4e63a..7631f8ff 100644 --- a/picasso/__version__.py +++ b/picasso/__version__.py @@ -1 +1 @@ -VERSION_NO = "0.6.6" +VERSION_NO = "0.6.7" diff --git a/release/one_click_windows_gui/create_installer_windows.bat b/release/one_click_windows_gui/create_installer_windows.bat index 71bfd1ed..dfbdf1f8 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.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 diff --git a/release/one_click_windows_gui/picasso_innoinstaller.iss b/release/one_click_windows_gui/picasso_innoinstaller.iss index bb9cbed4..781d615a 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.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 diff --git a/requirements.txt b/requirements.txt index e1591aaf..686cc129 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 -imageio==2.33.1 +moviepy==1.0.3 nd2==0.7.2 sqlalchemy==2.0.21 plotly-express==0.4.1 diff --git a/setup.py b/setup.py index 6da0cb84..c03b7b95 100644 --- a/setup.py +++ b/setup.py @@ -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=("joschnitzbauer@gmail.com, straussmaximilian@gmail.com, rafalkowalewski998@gmail.com"), url="https://github.com/jungmannlab/picasso",