diff --git a/.github/workflows/package-macos.yml b/.github/workflows/package-macos.yml index a9b7da28..6a116008 100644 --- a/.github/workflows/package-macos.yml +++ b/.github/workflows/package-macos.yml @@ -34,7 +34,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v7 with: - python-version: 3.14 + python-version: 3.13 check-latest: true cache: 'pip' - name: Install python dependencies diff --git a/.github/workflows/package-windows.yml b/.github/workflows/package-windows.yml index 2e7408a5..3c28eef6 100644 --- a/.github/workflows/package-windows.yml +++ b/.github/workflows/package-windows.yml @@ -43,8 +43,8 @@ jobs: - name: Set up Python uses: actions/setup-python@v7 with: - # new enough to not worry about emudhra - python-version: 3.13.17 + python-version: 3.13 + check-latest: true cache: 'pip' - name: Install dependencies env: diff --git a/kindlecomicconverter/KCC_rc.py b/kindlecomicconverter/KCC_rc.py index 53828345..a7ef3b55 100644 --- a/kindlecomicconverter/KCC_rc.py +++ b/kindlecomicconverter/KCC_rc.py @@ -1,6 +1,6 @@ # Resource object code (Python 3) # Created by: object code -# Created by: The Resource Compiler for Qt version 6.12.0 +# Created by: The Resource Compiler for Qt version 6.10.0 # WARNING! All changes made in this file will be lost! from PySide6 import QtCore diff --git a/kindlecomicconverter/KCC_ui.py b/kindlecomicconverter/KCC_ui.py index ee7edcc7..c63397d5 100644 --- a/kindlecomicconverter/KCC_ui.py +++ b/kindlecomicconverter/KCC_ui.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'KCC.ui' ## -## Created by: Qt User Interface Compiler version 6.12.0 +## Created by: Qt User Interface Compiler version 6.10.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ diff --git a/kindlecomicconverter/KCC_ui_editor.py b/kindlecomicconverter/KCC_ui_editor.py index 12840916..d908cd26 100644 --- a/kindlecomicconverter/KCC_ui_editor.py +++ b/kindlecomicconverter/KCC_ui_editor.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'MetaEditor.ui' ## -## Created by: Qt User Interface Compiler version 6.12.0 +## Created by: Qt User Interface Compiler version 6.10.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ diff --git a/kindlecomicconverter/shared.py b/kindlecomicconverter/shared.py index 12143170..2bab0d51 100644 --- a/kindlecomicconverter/shared.py +++ b/kindlecomicconverter/shared.py @@ -148,7 +148,8 @@ def dependencyCheck(level): from pymupdf import __version__ as pymupdfVersion if Version('1.16.1') > Version(pymupdfVersion): missing.append('PyMuPDF 1.16.1+') - except ImportError: + except ImportError as e: + print(e) missing.append('PyMuPDF 1.16.1+') if len(missing) > 0: print('ERROR: ' + ', '.join(missing) + ' is not installed!') diff --git a/requirements.txt b/requirements.txt index ee7fce38..b585a08e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -PySide6; platform_system != 'Windows' -PySide6<6.10; platform_system == 'Windows' +PySide6; platform_system == 'Linux' +PySide6==6.10.0; platform_system != 'Linux' Pillow>=11.3.0 psutil>=7.2.2 requests>=2.34.2