Merge pull request #552 from jungmannlab/development

rafalkowalewski1 · web-flow · commit bd4e58d0de08 · 2025-10-01T09:48:52.000+02:00
Development
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.6
+current_version = 0.8.7
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?
diff --git a/.gitignore b/.gitignore
@@ -29,7 +29,7 @@ wheels/
 picasso/gui/plugins/
 
 # Sound notifications
-picasso/notification_sounds/
+picasso/gui/notification_sounds/
 
 # Camera configuration
 picasso/config.yaml
diff --git a/changelog.rst b/changelog.rst
@@ -3,7 +3,7 @@ Changelog
 
 Last change: 01-OCT-2025 CEST
 
-0.8.5-6
+0.8.5-7
 -------
 - Sound notifications when long processes finish, see `here <https://picassosr.readthedocs.io/en/latest/others.html>`_
 - Several dialogs in Render, Localize and Simulate are now scrollable (*experimental*)
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.8.6
+AppVersion=0.8.7
 DefaultDirName={commonpf}\Picasso
 DefaultGroupName=Picasso
-OutputBaseFilename="Picasso-Windows-64bit-0.8.6"
+OutputBaseFilename="Picasso-Windows-64bit-0.8.7"
 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.8.6"
+release = "0.8.7"
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/docs/others.rst b/docs/others.rst
@@ -4,18 +4,18 @@ Other
 
 Sound notifications
 -------------------
-Starting in version 0.8.5, Picasso supports sound notifications. In Render and SPINNA, these can be selected in the ``File`` menu in the menu bar. The available files are read from the ``notification_sounds`` folder. ``.mp3`` and ``.wav`` files are supported. Default sound notification is saved automatically when manually changed.
+Starting in version 0.8.5, Picasso supports sound notifications. In Render and SPINNA, these can be selected in the ``File`` menu in the menu bar. The available files are read from the ``picasso/gui/notification_sounds`` folder. ``.mp3`` and ``.wav`` files are supported. Default sound notification is saved automatically when manually changed.
 
 Custom notifications
 ~~~~~~~~~~~~~~~~~~~~
-To add custom notification sounds, copy the sound files (``.mp3`` or ``.wav``) to the  ``notification_sounds`` folder. Depending on how you installed Picasso, this folder can be found in different locations:
+To add custom notification sounds, copy the sound files (``.mp3`` or ``.wav``) to the  ``picasso/gui/notification_sounds`` folder. Depending on how you installed Picasso, this folder can be found in different locations:
 
 GitHub
 ------
 If you cloned the GitHub repository, you can add sound notifications by following these steps:
 
 - Find the directory where you cloned the GitHub repository with Picasso.
-- Go to ``picasso/notification_sounds``.
+- Go to ``picasso/gui/notification_sounds``.
 - Copy the sound files to this folder.
 
 PyPI
@@ -24,7 +24,7 @@ If you installed Picasso using ``pip install picassosr``, you can add sound noti
 
 - Activate your conda environment where ``picassosr`` is installed by typing ``conda activate YOUR_ENVIRONMENT``.
 - To find the location of the package, type ``pip show picassosr`` and look for the line starting with ``Location:``.
-- Navigate to this location and go to ``picasso/notification_sounds``.
+- Navigate to this location and go to ``picasso/gui/notification_sounds``.
 - Copy the sound files to this folder.
 
 
@@ -33,5 +33,5 @@ One click installer
 If you installed Picasso using the one click installer from `the Picasso release page <https://github.com/jungmannlab/picasso/releases/>`__ , you can add sound notifications by following these steps:
 
 - Find the location where you installed Picasso. By default, it is ``C:/Picasso``. *Before version 0.8.3, the default location was* ``C:/Program Files/Picasso``.
-- Go to the following subfolder in the `Picasso` directory: ``picasso/notification_sounds``.
+- Go to the following subfolder: ``picasso/gui/notification_sounds``.
 - Copy the sound files to this folder.
diff --git a/picasso/__init__.py b/picasso/__init__.py
@@ -11,7 +11,7 @@
 import os.path
 import yaml as yaml
 
-__version__ = "0.8.6"
+__version__ = "0.8.7"
 
 _this_file = os.path.abspath(__file__)
 _this_dir = os.path.dirname(_this_file)
diff --git a/picasso/__version__.py b/picasso/__version__.py
@@ -1 +1 @@
-VERSION_NO = "0.8.6"
+VERSION_NO = "0.8.7"
diff --git a/picasso/gui/notification_sounds/Bell.wav b/picasso/gui/notification_sounds/Bell.wav
diff --git a/picasso/gui/notification_sounds/Doorbell.wav b/picasso/gui/notification_sounds/Doorbell.wav
diff --git a/picasso/gui/notification_sounds/Magic.wav b/picasso/gui/notification_sounds/Magic.wav
diff --git a/picasso/gui/notification_sounds/Melodical_flute.wav b/picasso/gui/notification_sounds/Melodical_flute.wav
diff --git a/picasso/gui/notification_sounds/Ping.wav b/picasso/gui/notification_sounds/Ping.wav
diff --git a/picasso/gui/notification_sounds/Sci-fi.wav b/picasso/gui/notification_sounds/Sci-fi.wav
diff --git a/picasso/lib.py b/picasso/lib.py
@@ -333,8 +333,15 @@ def set_sound_notification(action: QtWidgets.QAction) -> None:
 
 def _sound_notification_dir() -> str:
     """Return the path to the sound notification folder."""
+    print(os.path.join(
+        os.path.dirname(os.path.realpath(__file__)),
+        "gui",
+        "notification_sounds",
+    ))
     return os.path.join(
-        os.path.dirname(os.path.realpath(__file__)), "notification_sounds",
+        os.path.dirname(os.path.realpath(__file__)),
+        "gui",
+        "notification_sounds",
     )
 
 
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.8.6-py3-none-any.whl"
+call pip install "../../dist/picassosr-0.8.7-py3-none-any.whl"
 
 call pip install pyinstaller==5.12
 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.8.6
+AppVersion=0.8.7
 DefaultDirName="C:\Picasso"
 DefaultGroupName=Picasso
-OutputBaseFilename="Picasso-Windows-64bit-0.8.6"
+OutputBaseFilename="Picasso-Windows-64bit-0.8.7"
 ArchitecturesAllowed=x64
 ArchitecturesInstallIn64BitMode=x64
 
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
     name="picassosr",
-    version="0.8.6",
+    version="0.8.7",
     author="Joerg Schnitzbauer, Maximilian T. Strauss, Rafal Kowalewski",
     author_email=(
         "joschnitzbauer@gmail.com, "
@@ -22,9 +22,9 @@
         "picasso",
         "picasso.gui",
         "picasso.gui.plugins",
+        "picasso.gui.notification_sounds",
         "picasso.server",
         "picasso.ext",
-        "picasso.notification_sounds",
     ],
     entry_points={
         "console_scripts": ["picasso=picasso.__main__:main"],
@@ -42,6 +42,8 @@
         "picasso": [
             "gui/icons/*.ico",
             "gui/icons/*.png",
+            "gui/notification_sounds/*.mp3",
+            "gui/notification_sounds/*.wav",
             "config_template.yaml",
         ]
     },

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-VERSION_NO = "0.8.6"`
	`1`	`+VERSION_NO = "0.8.7"`