shinestacker 0.2.0.post1.dev1__tar.gz → 0.2.1__tar.gz

{shinestacker-0.2.0.post1.dev1/sandbox → shinestacker-0.2.1/.github/workflows}/pypi-publish.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     permissions:
-      id-token: write  # Needed for trusted publishing (if you prefer)
+      id-token: write
       contents: read
 
     steps:

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 0.2.0.post1.dev1
+Version: 0.2.1
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0
@@ -30,6 +30,8 @@ Dynamic: license-file
 # Shine Stacker Processing Framework
 
 [![CI multiplatform](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml/badge.svg)](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml)
+[![PyPI version](https://badge.fury.io/py/shinestacker.svg)](https://pypi.org/project/shinestacker/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/shinestacker)](https://pypi.org/project/shinestacker/)
 
 <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies.gif' width="400">  <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies_stack.jpg' width="400">
 

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.1}/README.md

@@ -1,6 +1,8 @@
 # Shine Stacker Processing Framework
 
 [![CI multiplatform](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml/badge.svg)](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml)
+[![PyPI version](https://badge.fury.io/py/shinestacker.svg)](https://pypi.org/project/shinestacker/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/shinestacker)](https://pypi.org/project/shinestacker/)
 
 <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies.gif' width="400">  <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies_stack.jpg' width="400">
 

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.1}/docs/main.md

@@ -1,6 +1,8 @@
 # Shine Stacker Processing Framework
 
 [![CI multiplatform](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml/badge.svg)](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml)
+[![PyPI version](https://badge.fury.io/py/shinestacker.svg)](https://pypi.org/project/shinestacker/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/shinestacker)](https://pypi.org/project/shinestacker/)
 
 <img src='../img/flies.gif' width="400">  <img src='../img/flies_stack.jpg' width="400">
 

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.1}/scripts/build_release.py

@@ -20,20 +20,14 @@ pyinstaller_cmd = ["pyinstaller", "--onedir", f"--name={app_name}", "--paths=src
                    f"--distpath=dist/{package_dir}", f"--collect-all={project_name}",
                    "--collect-data=imagecodecs", "--collect-submodules=imagecodecs", "--copy-metadata=imagecodecs"]
 if sys_name == 'darwin':
-    pyinstaller_cmd += ["--windowed", "--icon=ico/shinestacker.icns"]
+    pyinstaller_cmd += ["--windowed", "--icon=src/shinestacker/gui/ico/shinestacker.icns"]
 elif sys_name == 'windows':
-    pyinstaller_cmd += ["--windowed", "--icon=ico/shinestacker.ico"]
+    pyinstaller_cmd += ["--windowed", "--icon=src/shinestacker/gui/ico/shinestacker.ico"]
 pyinstaller_cmd += ["src/shinestacker/app/main.py"]
 
 print(" ".join(pyinstaller_cmd))
 subprocess.run(pyinstaller_cmd, check=True)
 
-ico_dir = project_root / "ico"
-target_ico = dist_dir / package_dir / "ico"
-if target_ico.exists():
-    shutil.rmtree(target_ico)
-shutil.copytree(ico_dir, target_ico)
-
 examples_dir = project_root / "examples"
 target_examples = dist_dir / package_dir / "examples"
 target_examples.mkdir(exist_ok=True)

shinestacker-0.2.1/src/shinestacker/_version.py

@@ -0,0 +1 @@
+__version__ = '0.2.1'

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.1}/src/shinestacker/app/main.py

@@ -138,12 +138,7 @@ expert options are visible by default.
         app.setAttribute(Qt.AA_DontUseNativeMenuBar)
     else:
         disable_macos_special_menu_items()
-    icon_path = f'{get_app_base_path()}'
-    if os.path.exists(f'{icon_path}/ico'):
-        icon_path = f'{icon_path}/ico'
-    else:
-        icon_path = f'{icon_path}/../ico'
-    icon_path = f'{icon_path}/shinestacker.png'
+    icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
     app.setWindowIcon(QIcon(icon_path))
     main_app = MainApp()
     app.main_app = main_app

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.1}/src/shinestacker/app/project.py

@@ -73,7 +73,8 @@ expert options are visible by default.
         app.setAttribute(Qt.AA_DontUseNativeMenuBar)
     else:
         disable_macos_special_menu_items()
-    app.setWindowIcon(QIcon(f'{get_app_base_path()}/ico/shinestacker.png'))
+    icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
+    app.setWindowIcon(QIcon(icon_path))
     window = ProjectApp()
     if args['expert']:
         window.set_expert_options()

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.1}/src/shinestacker/app/retouch.py

@@ -1,3 +1,4 @@
+import os
 import sys
 import argparse
 from PySide6.QtWidgets import QApplication, QMenu
@@ -70,7 +71,8 @@ Multiple directories can be specified separated by ';'.
         app.setAttribute(Qt.AA_DontUseNativeMenuBar)
     else:
         disable_macos_special_menu_items()
-    app.setWindowIcon(QIcon(f'{get_app_base_path()}/ico/shinestacker.png'))
+    icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
+    app.setWindowIcon(QIcon(icon_path))
     editor = RetouchApp()
     app.editor = editor
     editor.show()

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.1}/src/shinestacker/gui/main_window.py

@@ -414,6 +414,9 @@ class MainWindow(ActionsWindow, LogManager):
                     menu.addAction(self.job_retouch_path_action)
             menu.exec(event.globalPos())
 
+    def get_icon(self, icon):
+        return QIcon(os.path.join(self.script_dir, f"img/{icon}.png"))
+
     def get_retouch_path(self, job):
         frames_path = [get_action_output_path(action)[0]
                        for action in job.sub_actions if action.type_name == constants.ACTION_COMBO]

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.1}/src/shinestacker/gui/new_project.py

@@ -39,12 +39,7 @@ class NewProjectDialog(QDialog):
         self.layout.addRow(label)
 
     def create_form(self):
-        icon_path = f'{get_app_base_path()}'
-        if os.path.exists(f'{icon_path}/ico'):
-            icon_path = f'{icon_path}/ico'
-        else:
-            icon_path = f'{icon_path}/../ico'
-        icon_path = f'{icon_path}/shinestacker.png'
+        icon_path = f"{os.path.dirname(__file__)}/ico/shinestacker.png"
         app_icon = QIcon(icon_path)
         icon_pixmap = app_icon.pixmap(128, 128)
         icon_label = QLabel()

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.1}/src/shinestacker/gui/project_editor.py

@@ -328,9 +328,6 @@ class ProjectEditor(QMainWindow):
         label = QLabel(html_text)
         widget_list.setItemWidget(item, label)
 
-    def get_icon(self, icon):
-        return QIcon(os.path.join(self.script_dir, f"img/{icon}.png"))
-
     def add_action_CombinedActions(self):
         self.add_action(constants.ACTION_COMBO)
 

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.1}/src/shinestacker/retouch/exif_data.py

@@ -32,12 +32,7 @@ class ExifData(QDialog):
         self.layout.addRow(label)
 
     def create_form(self):
-        icon_path = f'{get_app_base_path()}'
-        if os.path.exists(f'{icon_path}/ico'):
-            icon_path = f'{icon_path}/ico'
-        else:
-            icon_path = f'{icon_path}/../ico'
-        icon_path = f'{icon_path}/shinestacker.png'
+        icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
         app_icon = QIcon(icon_path)
         icon_pixmap = app_icon.pixmap(128, 128)
         icon_label = QLabel()

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.1}/src/shinestacker/retouch/image_editor.py

@@ -364,8 +364,6 @@ class ImageEditor(QMainWindow):
             QMessageBox.critical(self, "Save Error", f"Could not save file: {str(e)}")
 
     def select_exif_path(self):
-        if self.current_stack is None:
-            return
         path, _ = QFileDialog.getOpenFileName(None, "Select file with exif data")
         if path:
             self.exif_path = path

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.1}/src/shinestacker/retouch/shortcuts_help.py

@@ -44,12 +44,7 @@ class ShortcutsHelp(QDialog):
         layout.addRow(label)
 
     def create_form(self, left_layout, right_layout):
-        icon_path = f'{get_app_base_path()}'
-        if os.path.exists(f'{icon_path}/ico'):
-            icon_path = f'{icon_path}/ico'
-        else:
-            icon_path = f'{icon_path}/../ico'
-        icon_path = f'{icon_path}/shinestacker.png'
+        icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
         app_icon = QIcon(icon_path)
         icon_pixmap = app_icon.pixmap(128, 128)
         icon_label = QLabel()

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.1}/src/shinestacker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 0.2.0.post1.dev1
+Version: 0.2.1
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0
@@ -30,6 +30,8 @@ Dynamic: license-file
 # Shine Stacker Processing Framework
 
 [![CI multiplatform](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml/badge.svg)](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml)
+[![PyPI version](https://badge.fury.io/py/shinestacker.svg)](https://pypi.org/project/shinestacker/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/shinestacker)](https://pypi.org/project/shinestacker/)
 
 <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies.gif' width="400">  <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies_stack.jpg' width="400">
 

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.1}/src/shinestacker.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ LICENSE
 README.md
 pyproject.toml
 .github/workflows/ci-multiplatform.yml
+.github/workflows/pypi-publish.yml
 .github/workflows/release.yml
 docs/alignment.md
 docs/balancing.md
@@ -44,10 +45,6 @@ examples/input/img-vignetted/vig-0000.jpg
 examples/input/img-vignetted/vig-0001.jpg
 examples/input/img-vignetted/vig-0002.jpg
 examples/input/img-vignetted/vig-0003.jpg
-ico/focus_stack_bkg.png
-ico/shinestacker.icns
-ico/shinestacker.ico
-ico/shinestacker.png
 img/flies.gif
 img/flies_stack.jpg
 img/flow-diagram.png
@@ -55,7 +52,6 @@ img/gui-finder.png
 img/gui-project-new.png
 img/gui-project-run.png
 img/gui-retouch.png
-sandbox/pypi-publish.yml
 sandbox/test_alignment_multiple.py
 scripts/build_release.py
 scripts/validate-tomli.py
@@ -111,6 +107,10 @@ src/shinestacker/gui/new_project.py
 src/shinestacker/gui/project_converter.py
 src/shinestacker/gui/project_editor.py
 src/shinestacker/gui/project_model.py
+src/shinestacker/gui/ico/focus_stack_bkg.png
+src/shinestacker/gui/ico/shinestacker.icns
+src/shinestacker/gui/ico/shinestacker.ico
+src/shinestacker/gui/ico/shinestacker.png
 src/shinestacker/gui/img/close-round-line-icon.png
 src/shinestacker/gui/img/forward-button-icon.png
 src/shinestacker/gui/img/play-button-round-icon.png

shinestacker-0.2.0.post1.dev1/src/shinestacker/_version.py

@@ -1 +0,0 @@
-__version__ = '0.2.0.post1.dev1'