Merge pull request #475 from jungmannlab/development

Development
jungmannlab · Jun 6, 2024 · e6ff468 · e6ff468
2 parents 6ab3a5b + eedbf73
commit e6ff468
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.10
+current_version = 0.6.11
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?

diff --git a/changelog.rst b/changelog.rst
@@ -3,7 +3,7 @@ Changelog
 
 Last change: 06-JUN-2024 MTS
 
-0.6.9 - 0.6.10
+0.6.9 - 0.6.11
 --------------
 - Added the option to draw polygon picks in Picasso: Render
 - Save pick properties in Picasso: Render saves areas of picked regions in nm^2
@@ -14,6 +14,7 @@ Last change: 06-JUN-2024 MTS
 - Picasso: Localize - added the option to save the current view as a .png file
 - Picasso: Render - functions related to picking moved to ``picasso.lib`` and ``picasso.postprocess``
 - Picasso: Render - saving picked localizations saves the area(s) of the picked region(s) in the metadata file (.yaml)
+- Documentation on readthedocs works again
 
 0.6.6 - 0.6.8
 -------------

diff --git 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.10
+AppVersion=0.6.11
 DefaultDirName={commonpf}\Picasso
 DefaultGroupName=Picasso
-OutputBaseFilename="Picasso-Windows-64bit-0.6.10"
+OutputBaseFilename="Picasso-Windows-64bit-0.6.11"
 ArchitecturesAllowed=x64
 ArchitecturesInstallIn64BitMode=x64
 

diff --git 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.10"
+release = "0.6.11"
 
 # -- General configuration ---------------------------------------------------
 

diff --git a/picasso/__init__.py b/picasso/__init__.py
@@ -8,7 +8,7 @@
 import os.path as _ospath
 import yaml as _yaml
 
-__version__ = "0.6.10"
+__version__ = "0.6.11"
 
 _this_file = _ospath.abspath(__file__)
 _this_dir = _ospath.dirname(_this_file)

diff --git a/picasso/__version__.py b/picasso/__version__.py
@@ -1 +1 @@
-VERSION_NO = "0.6.10"
+VERSION_NO = "0.6.11"
diff --git 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.10-py3-none-any.whl"
+call pip install "../../dist/picassosr-0.6.11-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
@@ -1,10 +1,10 @@
 [Setup]
 AppName=Picasso
 AppPublisher=Jungmann Lab, Max Planck Institute of Biochemistry
-AppVersion=0.6.10
+AppVersion=0.6.11
 DefaultDirName={commonpf}\Picasso
 DefaultGroupName=Picasso
-OutputBaseFilename="Picasso-Windows-64bit-0.6.10"
+OutputBaseFilename="Picasso-Windows-64bit-0.6.11"
 ArchitecturesAllowed=x64
 ArchitecturesInstallIn64BitMode=x64
 

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
     name="picassosr",
-    version="0.6.10",
+    version="0.6.11",
     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",