diff --git a/.gitignore b/.gitignore index 9a0569a..0c80667 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /0.8.1.tar.gz /0.10.tar.gz /0.11.tar.gz +/v0.12.tar.gz diff --git a/0001-Python-3.14-fixes.patch b/0001-Python-3.14-fixes.patch deleted file mode 100644 index bc59038..0000000 --- a/0001-Python-3.14-fixes.patch +++ /dev/null @@ -1,93 +0,0 @@ -From b8d08a8a980693233db124a17db33a500addf428 Mon Sep 17 00:00:00 2001 -From: Dick Marinus -Date: Thu, 29 May 2025 08:11:49 +0200 -Subject: [PATCH] Python 3.14 fixes - ---- - .github/workflows/test.yml | 2 +- - alot/__main__.py | 6 ++++-- - alot/ui.py | 3 +-- - tests/utilities.py | 3 +-- - 4 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml -index 56345807..b899108f 100644 ---- a/.github/workflows/test.yml -+++ b/.github/workflows/test.yml -@@ -11,7 +11,7 @@ jobs: - strategy: - fail-fast: false - matrix: -- python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] -+ python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.14.0-beta.2"] - - steps: - - uses: actions/checkout@v4 -diff --git a/alot/__main__.py b/alot/__main__.py -index 21f85be5..aa5904a8 100644 ---- a/alot/__main__.py -+++ b/alot/__main__.py -@@ -6,6 +6,7 @@ import locale - import logging - import os - import sys -+import asyncio - - import alot - from alot.settings.const import settings -@@ -18,7 +19,8 @@ from alot.commands import CommandParseError, COMMANDS - from alot.utils import argparse as cargparse - - from twisted.internet import asyncioreactor --asyncioreactor.install() -+EVENT_LOOP = asyncio.new_event_loop() -+asyncioreactor.install(EVENT_LOOP) - - - _SUBCOMMANDS = ['search', 'compose', 'bufferlist', 'taglist', 'namedqueries', -@@ -137,7 +139,7 @@ def main(): - cmdstring = ' '.join(options.command) - - # set up and start interface -- UI(dbman, cmdstring) -+ UI(dbman, cmdstring, EVENT_LOOP) - - # run the exit hook - exit_hook = settings.get_hook('exit') -diff --git a/alot/ui.py b/alot/ui.py -index edc01010..4c44809a 100644 ---- a/alot/ui.py -+++ b/alot/ui.py -@@ -44,7 +44,7 @@ class UI: - responsible for opening, closing and focussing buffers. - """ - -- def __init__(self, dbman, initialcmdline): -+ def __init__(self, dbman, initialcmdline, loop): - """ - :param dbman: :class:`~alot.db.DBManager` - :param initialcmdline: commandline applied after setting up interface -@@ -121,7 +121,6 @@ class UI: - unhandled_input=self._unhandled_input, - input_filter=self._input_filter) - -- loop = asyncio.get_event_loop() - # Create a task for the periodic hook - loop_hook = settings.get_hook('loop_hook') - if loop_hook: -diff --git a/tests/utilities.py b/tests/utilities.py -index 671fe574..809951f6 100644 ---- a/tests/utilities.py -+++ b/tests/utilities.py -@@ -185,7 +185,6 @@ def async_test(coro): - - @functools.wraps(coro) - def _actual(*args, **kwargs): -- loop = asyncio.get_event_loop() -- return loop.run_until_complete(coro(*args, **kwargs)) -+ asyncio.run(coro(*args, **kwargs)) - - return _actual --- -2.49.0 - diff --git a/0001-replace-python-magic-with-file-magic.patch b/0001-replace-python-magic-with-file-magic.patch index 9958290..e7352b2 100644 --- a/0001-replace-python-magic-with-file-magic.patch +++ b/0001-replace-python-magic-with-file-magic.patch @@ -1,6 +1,6 @@ -From a187328cd232124c49b60954f970a8566869cfbb Mon Sep 17 00:00:00 2001 +From 893538d39f60003489200cf166f806a4c335097d Mon Sep 17 00:00:00 2001 From: Dick Marinus -Date: Tue, 22 Apr 2025 20:32:23 +0200 +Date: Sat, 6 Dec 2025 20:59:33 +0100 Subject: [PATCH] replace python-magic with file-magic --- @@ -8,7 +8,7 @@ Subject: [PATCH] replace python-magic with file-magic 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml -index ac26a7b2..a54dabff 100644 +index 4a0acac6..b2ea86fa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,7 @@ dependencies = [ @@ -19,7 +19,7 @@ index ac26a7b2..a54dabff 100644 + "file-magic", "configobj>=4.7.0", "gpg>1.10.0", - ] + "standard-mailcap; python_version>'3.12'" -- -2.49.0 +2.52.0 diff --git a/alot.spec b/alot.spec index 6b5b761..57cb5d1 100644 --- a/alot.spec +++ b/alot.spec @@ -1,14 +1,13 @@ Name: alot -Version: 0.11 -Release: 12%{?dist} +Version: 0.12 +Release: 1%{?dist} Summary: Experimental terminal MUA based on notmuch mail # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later URL: https://github.com/pazz/alot -Source0: %{url}/archive/%{version}/%{version}.tar.gz +Source: %{url}/archive/refs/tags/v%{version}.tar.gz Patch: 0001-replace-python-magic-with-file-magic.patch -Patch: 0001-Python-3.14-fixes.patch BuildArch: noarch @@ -55,6 +54,9 @@ install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/default %{python3_sitelib}/alot/defaults %changelog +* Sat Dec 6 2025 Dick Marinus - 0.12-1 +- New upstream release 0.12 + * Fri Sep 19 2025 Python Maint - 0.11-12 - Rebuilt for Python 3.14.0rc3 bytecode diff --git a/sources b/sources index 549a93c..352201f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (0.11.tar.gz) = ef259cf88cbe31509cf10a91c6bc84e717d751e6363744bd50d0625fb48db59f33f958e2566524d3be1088c3a68d2799b2dfda7aa39960a1780d09842af50c97 +SHA512 (v0.12.tar.gz) = 927dafd3a6f36ecd09be407384f676d9f89840c2a436e9f762627bf0073aba6a27363061257f32911f6e60a065e00b022e97799525e63568896ea07d3c2832f1