Merge branch '4.3.x'

Update appdata for 4.3.1
Set version to 4.3.1
2026-01-21 14:01:14 -05:00 · 2024-05-04 09:48:35 +02:00 · 2024-05-03 17:00:20 +02:00 · 2024-05-03 15:30:36 +02:00 · 2024-05-03 15:30:17 +02:00 · 2024-05-03 13:29:51 +00:00
13 changed files with 14 additions and 10 deletions
--- a/.github/workflows/build_release.yml
+++ b/.github/workflows/build_release.yml
@@ -101,7 +101,7 @@ jobs:
      run: |
        python3 --version
        pip3 install --upgrade pip wheel
-        pip3 install --upgrade -r requirements.txt --no-binary cffi,CT3,PyYAML --no-dependencies
+        pip3 install --upgrade -r requirements.txt --no-binary cffi,CT3,PyYAML,charset_normalizer --no-dependencies
        PYINSTALLER_COMPILE_BOOTLOADER=1 pip3 install --upgrade -r builder/requirements.txt --no-binary pyinstaller --no-dependencies
    - name: Import macOS codesign certificates
      # Taken from https://github.com/Apple-Actions/import-codesign-certs/pull/27 (comments)
--- a/README.mkd
+++ b/README.mkd
@@ -1,6 +1,8 @@
-Release Notes - SABnzbd 4.3.0
+Release Notes - SABnzbd 4.3.1
 =========================================================

+This is the first bug fix release of SABnzbd 4.3.0.
+
 ## Key changes since 4.2.0

 * **Archive:**
--- a/builder/SABnzbd.spec
+++ b/builder/SABnzbd.spec
@@ -15,6 +15,7 @@ extra_pyinstaller_files = []

 # Add hidden imports
 extra_hiddenimports = ["Cheetah.DummyTransaction", "cheroot.ssl.builtin", "certifi"]
+extra_hiddenimports.extend(collect_submodules("apprise"))
 extra_hiddenimports.extend(collect_submodules("babelfish.converters"))
 extra_hiddenimports.extend(collect_submodules("guessit.data"))

@@ -40,7 +41,7 @@ else:
    )

    # Windows
-    extra_hiddenimports.append("win32timezone")
+    extra_hiddenimports.extend(["win32timezone", "winrt.windows.foundation.collections"])
    EXTRA_FOLDERS += ["win/multipar/", "win/par2/", "win/unrar/", "win/7zip/"]
    EXTRA_FILES += ["portable.cmd"]

@@ -91,12 +92,14 @@ for folder_item in EXTRA_FOLDERS:
 # Add babelfish data files
 extra_pyinstaller_files.extend(collect_data_files("babelfish"))
 extra_pyinstaller_files.extend(collect_data_files("guessit"))
+extra_pyinstaller_files.extend(collect_data_files("apprise"))

 pyi_analysis = Analysis(
    ["SABnzbd.py"],
    datas=extra_pyinstaller_files,
    hiddenimports=extra_hiddenimports,
    excludes=["ujson", "FixTk", "tcl", "tk", "_tkinter", "tkinter", "Tkinter", "pydoc", "pydoc_data.topics"],
+    module_collection_mode={"apprise.plugins": "py"},
 )

 pyz = PYZ(pyi_analysis.pure, pyi_analysis.zipped_data)
--- a/icons/apprise/apprise-failure.png
+++ b/icons/apprise/apprise-failure.png
--- a/icons/apprise/apprise-info.png
+++ b/icons/apprise/apprise-info.png
--- a/icons/apprise/apprise-success.png
+++ b/icons/apprise/apprise-success.png
--- a/icons/apprise/apprise-warning.png
+++ b/icons/apprise/apprise-warning.png
--- a/linux/org.sabnzbd.sabnzbd.appdata.xml
+++ b/linux/org.sabnzbd.sabnzbd.appdata.xml
@@ -30,6 +30,7 @@
  <url type="faq">https://sabnzbd.org/wiki/faq</url>
  <url type="contact">https://sabnzbd.org/live-chat.html</url>
  <releases>
+    <release version="4.3.1" date="2024-05-03" type="stable"/>
    <release version="4.3.0" date="2024-05-01" type="stable"/>
    <release version="4.2.2" date="2024-02-01" type="stable"/>
    <release version="4.2.1" date="2024-01-05" type="stable"/>
--- a/po/email/SABemail.pot
+++ b/po/email/SABemail.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"
--- a/po/main/SABnzbd.pot
+++ b/po/main/SABnzbd.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"
--- a/po/nsis/SABnsis.pot
+++ b/po/nsis/SABnsis.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC2\n"
+"Project-Id-Version: SABnzbd-4.3.1\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"
--- a/sabnzbd/notifier.py
+++ b/sabnzbd/notifier.py
@@ -328,8 +328,6 @@ def send_apprise(title, msg, notification_type, force=False, test=None):
        app_id="SABnzbd",
        app_desc="SABnzbd Notification",
        app_url="https://sabnzbd.org/",
-        image_path_mask=os.path.join(sabnzbd.DIR_PROG, "icons", "apprise", "apprise-{TYPE}.png"),
-        image_url_mask="https://sabnzbd.org/images/icons/apprise/{TYPE}.png",
        image_url_logo="https://sabnzbd.org/images/icons/apple-touch-icon-180x180-precomposed.png",
    )

--- a/sabnzbd/version.py
+++ b/sabnzbd/version.py
@@ -6,5 +6,5 @@
 # You MUST use double quotes (so " and not ')
 # Do not forget to update the appdata file for every major release!

-__version__ = "4.3.0"
-__baseline__ = "65d748fc9f0b303d5d54f8d1ea880c7fbde3660c"
+__version__ = "4.3.1"
+__baseline__ = "ef23d409720d4124cf715735af7392b79ad4cacc"
Author	SHA1	Message	Date
Safihre	41de13388c	Merge branch '4.3.x'	2024-05-04 09:48:35 +02:00
Safihre	f1e42707a0	Update appdata for 4.3.1	2024-05-03 17:00:20 +02:00
Safihre	1f16f13169	Set version to 4.3.1	2024-05-03 15:30:36 +02:00
Safihre	ef23d40972	Merge branch '4.3.x'	2024-05-03 15:30:17 +02:00
SABnzbd Automation	c1bdc3abff	Update translatable texts [skip ci]	2024-05-03 13:29:51 +00:00
Safihre	5cbb569b38	Update text files for 4.3.1	2024-05-03 15:28:03 +02:00
Safihre	d4a3f0ea79	Correct missing winrt and apprise imports on macOS/Windows builds	2024-05-03 14:04:00 +02:00
SABnzbd Automation	b31fe2cf49	Update translatable texts [skip ci]	2024-05-01 19:43:17 +00:00