From 220712b47f577527c56327c5f4be449b7008d06c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 14:06:32 +0200 Subject: [PATCH 01/20] Rebuilt for Python 3.13 --- alot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alot.spec b/alot.spec index dbbc558..f89bd86 100644 --- a/alot.spec +++ b/alot.spec @@ -1,6 +1,6 @@ Name: alot Version: 0.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Experimental terminal MUA based on notmuch mail License: GPLv3+ @@ -47,6 +47,9 @@ install -Dpm0644 docs/build/man/alot.1* -t %{buildroot}%{_mandir}/man1/ %{_mandir}/man1/alot.1* %changelog +* Fri Jun 07 2024 Python Maint - 0.10-4 +- Rebuilt for Python 3.13 + * Mon Jan 22 2024 Fedora Release Engineering - 0.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9ab25ff068862c9c249e7474fdb6031bfcdaae1e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:52:00 +0000 Subject: [PATCH 02/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- alot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alot.spec b/alot.spec index f89bd86..42516b0 100644 --- a/alot.spec +++ b/alot.spec @@ -1,6 +1,6 @@ Name: alot Version: 0.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Experimental terminal MUA based on notmuch mail License: GPLv3+ @@ -47,6 +47,9 @@ install -Dpm0644 docs/build/man/alot.1* -t %{buildroot}%{_mandir}/man1/ %{_mandir}/man1/alot.1* %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 0.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 0.10-4 - Rebuilt for Python 3.13 From 0c4c941fda921fa833280a71182bad9add34b170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 11:22:39 +0200 Subject: [PATCH 03/20] convert GPLv3+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- alot.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/alot.spec b/alot.spec index 42516b0..cbcd471 100644 --- a/alot.spec +++ b/alot.spec @@ -1,9 +1,10 @@ Name: alot Version: 0.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Experimental terminal MUA based on notmuch mail -License: GPLv3+ +# 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 Patch0: 0001-don-t-depend-on-weird-python-magic-distribution.patch @@ -47,6 +48,9 @@ install -Dpm0644 docs/build/man/alot.1* -t %{buildroot}%{_mandir}/man1/ %{_mandir}/man1/alot.1* %changelog +* Thu Jul 25 2024 Miroslav Suchý - 0.10-6 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 0.10-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b782b11e6d96878f39302068a966426c719604f8 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 26 Aug 2024 21:44:50 +0000 Subject: [PATCH 04/20] Update to 0.11 upstream release - Resolves: rhbz#2308054 Upstream tag: 0.11 Upstream commit: a8a108e2 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- alot.spec | 7 +++++-- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e215839..6b73de5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /0.7.tar.gz /0.8.1.tar.gz /0.10.tar.gz +/0.11.tar.gz diff --git a/README.packit b/README.packit index 786c2a0..94a5d96 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.80.0.post8+gf2b5fcbc. +The file was generated using packit 0.100.2.post1.dev4+g31a74ebd. diff --git a/alot.spec b/alot.spec index cbcd471..b9230a3 100644 --- a/alot.spec +++ b/alot.spec @@ -1,6 +1,6 @@ Name: alot -Version: 0.10 -Release: 6%{?dist} +Version: 0.11 +Release: 1%{?dist} Summary: Experimental terminal MUA based on notmuch mail # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -48,6 +48,9 @@ install -Dpm0644 docs/build/man/alot.1* -t %{buildroot}%{_mandir}/man1/ %{_mandir}/man1/alot.1* %changelog +* Mon Aug 26 2024 Packit - 0.11-1 +- New upstream release 0.11 + * Thu Jul 25 2024 Miroslav Suchý - 0.10-6 - convert license to SPDX diff --git a/sources b/sources index 84ecd51..549a93c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (0.10.tar.gz) = b07c77f3a21c9670fb14a760d036ce0e14678dd6ae75585cc929f97db5126a7dbb7f411244d317fea2913692afca6ff9f439f9dbbf047acffb8fcea2ebef7056 +SHA512 (0.11.tar.gz) = ef259cf88cbe31509cf10a91c6bc84e717d751e6363744bd50d0625fb48db59f33f958e2566524d3be1088c3a68d2799b2dfda7aa39960a1780d09842af50c97 From 8f236012b333d09eb235f1bec9f12dc6848e9e21 Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Mon, 2 Sep 2024 11:40:11 +0200 Subject: [PATCH 05/20] alot 0.11 Thanks-to: Matej Focko Signed-off-by: Tomas Tomecek --- .gitignore | 2 ++ ...d-on-weird-python-magic-distribution.patch | 27 ------------------- alot.spec | 22 +++++++++------ 3 files changed, 16 insertions(+), 35 deletions(-) delete mode 100644 0001-don-t-depend-on-weird-python-magic-distribution.patch diff --git a/.gitignore b/.gitignore index 6b73de5..9a0569a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ /alot-a7075ea6226f2dfed0142529f73989961ee7b65d.tar.gz /alot-0.6.tar.gz /alot-0.6.tar.gz.asc +/alot-0.10 +/alot-0.11 /0.7.tar.gz /0.8.1.tar.gz /0.10.tar.gz diff --git a/0001-don-t-depend-on-weird-python-magic-distribution.patch b/0001-don-t-depend-on-weird-python-magic-distribution.patch deleted file mode 100644 index e918868..0000000 --- a/0001-don-t-depend-on-weird-python-magic-distribution.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2f1d3760ffd3f60ba9d5563bb7985b39c229ab58 Mon Sep 17 00:00:00 2001 -From: Tomas Tomecek -Date: Thu, 12 Jan 2017 16:04:48 +0100 -Subject: [PATCH] don't depend on weird python-magic distribution - -https://github.com/pazz/alot/issues/765#issuecomment-143228725 - -Signed-off-by: Tomas Tomecek ---- - setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.py b/setup.py -index d98e6c9..1bf5033 100755 ---- a/setup.py -+++ b/setup.py -@@ -48,7 +48,6 @@ setup( - 'urwid>=1.3.0', - 'urwidtrees>=1.0.3', - 'twisted>=18.4.0', -- 'python-magic', - 'configobj>=4.7.0', - 'gpg' - ], --- -2.41.0 - diff --git a/alot.spec b/alot.spec index b9230a3..0837922 100644 --- a/alot.spec +++ b/alot.spec @@ -7,13 +7,17 @@ Summary: Experimental terminal MUA based on notmuch mail License: GPL-3.0-or-later URL: https://github.com/pazz/alot Source0: %{url}/archive/%{version}/%{version}.tar.gz -Patch0: 0001-don-t-depend-on-weird-python-magic-distribution.patch BuildArch: noarch BuildRequires: python3-devel -BuildRequires: python3-setuptools BuildRequires: python3-sphinx +BuildRequires: python3-setuptools +BuildRequires: python3-pip +BuildRequires: python3-wheel +BuildRequires: python3-setuptools_scm+toml +# needed to generate manpages +BuildRequires: python3-notmuch BuildRequires: make Requires: python3-notmuch >= 0.27 Requires: python3-urwid >= 1.3.0 @@ -31,19 +35,21 @@ its display. You are responsible for automatic initial tagging. %prep %autosetup -p1 +%generate_buildrequires + %build -%py3_build -%make_build man SPHINX_BUILD=sphinx-build-3 PYTHON=python3 -C docs +export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} +%pyproject_wheel +%make_build man PYTHONPATH=${PYTHONPATH}:$RPM_BUILD_DIR/alot-%{version} SPHINX_BUILD=sphinx-build-3 PYTHON=python3 -C docs %install -%py3_install +%pyproject_install +%pyproject_save_files -l alot install -Dpm0644 docs/build/man/alot.1* -t %{buildroot}%{_mandir}/man1/ -%files +%files -f %{pyproject_files} %license COPYING %doc NEWS README.md -%{python3_sitelib}/alot/ -%{python3_sitelib}/alot-*.egg-info/ %{_bindir}/alot %{_mandir}/man1/alot.1* From cde1a052b9fcd0ce0defbca5d1732ec5680962e3 Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Thu, 14 Nov 2024 14:27:11 +0100 Subject: [PATCH 06/20] Install alot's "defaults" files Resolves #2316430 Co-authored-by: Dick Marinus Signed-off-by: Tomas Tomecek --- alot.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/alot.spec b/alot.spec index 0837922..1154599 100644 --- a/alot.spec +++ b/alot.spec @@ -1,6 +1,6 @@ Name: alot Version: 0.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Experimental terminal MUA based on notmuch mail # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -18,7 +18,7 @@ BuildRequires: python3-wheel BuildRequires: python3-setuptools_scm+toml # needed to generate manpages BuildRequires: python3-notmuch -BuildRequires: make +BuildRequires: make Requires: python3-notmuch >= 0.27 Requires: python3-urwid >= 1.3.0 Requires: python3-urwidtrees >= 1.0 @@ -46,14 +46,19 @@ export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} %pyproject_install %pyproject_save_files -l alot install -Dpm0644 docs/build/man/alot.1* -t %{buildroot}%{_mandir}/man1/ +install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/defaults/ %files -f %{pyproject_files} %license COPYING %doc NEWS README.md %{_bindir}/alot %{_mandir}/man1/alot.1* +%{python3_sitelib}/alot/defaults %changelog +* Thu Nov 14 2024 Tomas Tomecek - 0.11-2 +- Install defaults + * Mon Aug 26 2024 Packit - 0.11-1 - New upstream release 0.11 From 983d61eb7594343c0aab98416f1744fc68705b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 18 Nov 2024 12:11:16 +0100 Subject: [PATCH 07/20] Run import check during the build This requires generating the BuildRequires --- alot.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/alot.spec b/alot.spec index 1154599..9f215fb 100644 --- a/alot.spec +++ b/alot.spec @@ -1,6 +1,6 @@ Name: alot Version: 0.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Experimental terminal MUA based on notmuch mail # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -36,6 +36,8 @@ its display. You are responsible for automatic initial tagging. %autosetup -p1 %generate_buildrequires +export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} +%pyproject_buildrequires %build export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} @@ -48,6 +50,9 @@ export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} install -Dpm0644 docs/build/man/alot.1* -t %{buildroot}%{_mandir}/man1/ install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/defaults/ +%check +%pyproject_check_import + %files -f %{pyproject_files} %license COPYING %doc NEWS README.md @@ -56,6 +61,9 @@ install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/default %{python3_sitelib}/alot/defaults %changelog +* Mon Nov 18 2024 Miro Hrončok - 0.11-3 +- Run import check during the build + * Thu Nov 14 2024 Tomas Tomecek - 0.11-2 - Install defaults From 53364269ea1757dfb8eb171441381e50a0207d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 18 Nov 2024 12:14:13 +0100 Subject: [PATCH 08/20] Remove displace manual Requires and BuildRequires --- alot.spec | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/alot.spec b/alot.spec index 9f215fb..a8e357d 100644 --- a/alot.spec +++ b/alot.spec @@ -11,21 +11,9 @@ Source0: %{url}/archive/%{version}/%{version}.tar.gz BuildArch: noarch BuildRequires: python3-devel -BuildRequires: python3-sphinx -BuildRequires: python3-setuptools -BuildRequires: python3-pip -BuildRequires: python3-wheel -BuildRequires: python3-setuptools_scm+toml # needed to generate manpages -BuildRequires: python3-notmuch +BuildRequires: python3-sphinx BuildRequires: make -Requires: python3-notmuch >= 0.27 -Requires: python3-urwid >= 1.3.0 -Requires: python3-urwidtrees >= 1.0 -Requires: python3-twisted >= 10.2.0 -Requires: python3-magic -Requires: python3-configobj >= 4.7.0 -Requires: python3-gpg %description alot makes use of existing solutions where possible: It does not fetch, send or From cd35056885de362514834b993427f4f144b4f223 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:53:23 +0000 Subject: [PATCH 09/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- alot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alot.spec b/alot.spec index a8e357d..ddf8305 100644 --- a/alot.spec +++ b/alot.spec @@ -1,6 +1,6 @@ Name: alot Version: 0.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Experimental terminal MUA based on notmuch mail # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -49,6 +49,9 @@ install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/default %{python3_sitelib}/alot/defaults %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 0.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Nov 18 2024 Miro Hrončok - 0.11-3 - Run import check during the build From 49c23307661e5cb91b810c7d1961d32468d6ca69 Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Tue, 15 Apr 2025 11:01:47 +0200 Subject: [PATCH 10/20] Depend on python-standard-mailcap mailcap was dropped from the standard python library and moved to a separate module that alot now depends on Signed-off-by: Tomas Tomecek --- alot.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/alot.spec b/alot.spec index ddf8305..581a555 100644 --- a/alot.spec +++ b/alot.spec @@ -1,6 +1,6 @@ Name: alot Version: 0.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Experimental terminal MUA based on notmuch mail # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -13,7 +13,9 @@ BuildArch: noarch BuildRequires: python3-devel # needed to generate manpages BuildRequires: python3-sphinx +BuildRequires: python3-standard-mailcap BuildRequires: make +Requires: python3-standard-mailcap %description alot makes use of existing solutions where possible: It does not fetch, send or @@ -49,6 +51,9 @@ install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/default %{python3_sitelib}/alot/defaults %changelog +* Tue Apr 15 2025 Tomas Tomecek - 0.11-5 +- Depend on python-standard-mailcap + * Thu Jan 16 2025 Fedora Release Engineering - 0.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From dbb5b10f5e36b698e551a4f911be9be4ebb5a497 Mon Sep 17 00:00:00 2001 From: Dick Marinus Date: Mon, 28 Apr 2025 07:57:44 +0200 Subject: [PATCH 11/20] Add unittest --- alot.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/alot.spec b/alot.spec index 581a555..8802560 100644 --- a/alot.spec +++ b/alot.spec @@ -1,6 +1,6 @@ Name: alot Version: 0.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Experimental terminal MUA based on notmuch mail # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -15,6 +15,7 @@ BuildRequires: python3-devel BuildRequires: python3-sphinx BuildRequires: python3-standard-mailcap BuildRequires: make +BuildRequires: procps-ng Requires: python3-standard-mailcap %description @@ -42,6 +43,7 @@ install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/default %check %pyproject_check_import +%{py3_test_envvars} %{python3} -m unittest %files -f %{pyproject_files} %license COPYING @@ -51,6 +53,9 @@ install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/default %{python3_sitelib}/alot/defaults %changelog +* Mon Apr 28 2025 Dick Marinus - 0.11-6 +- Add unittest + * Tue Apr 15 2025 Tomas Tomecek - 0.11-5 - Depend on python-standard-mailcap From eaaa9d6c217f01c2f5d54f3e7b3a79a5a80783e9 Mon Sep 17 00:00:00 2001 From: Dick Marinus Date: Mon, 28 Apr 2025 08:00:14 +0200 Subject: [PATCH 12/20] replace python-magic with file-magic --- ...replace-python-magic-with-file-magic.patch | 25 +++++++++++++++++++ alot.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0001-replace-python-magic-with-file-magic.patch diff --git a/0001-replace-python-magic-with-file-magic.patch b/0001-replace-python-magic-with-file-magic.patch new file mode 100644 index 0000000..9958290 --- /dev/null +++ b/0001-replace-python-magic-with-file-magic.patch @@ -0,0 +1,25 @@ +From a187328cd232124c49b60954f970a8566869cfbb Mon Sep 17 00:00:00 2001 +From: Dick Marinus +Date: Tue, 22 Apr 2025 20:32:23 +0200 +Subject: [PATCH] replace python-magic with file-magic + +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index ac26a7b2..a54dabff 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -30,7 +30,7 @@ dependencies = [ + "urwid>=1.3.0", + "urwidtrees>=1.0.3", + "twisted>=18.4.0", +- "python-magic", ++ "file-magic", + "configobj>=4.7.0", + "gpg>1.10.0", + ] +-- +2.49.0 + diff --git a/alot.spec b/alot.spec index 8802560..0c8611f 100644 --- a/alot.spec +++ b/alot.spec @@ -1,12 +1,13 @@ Name: alot Version: 0.11 -Release: 6%{?dist} +Release: 7%{?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 +Patch: 0001-replace-python-magic-with-file-magic.patch BuildArch: noarch @@ -53,6 +54,9 @@ install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/default %{python3_sitelib}/alot/defaults %changelog +* Tue Apr 29 2025 Dick Marinus - 0.11-7 +- Replace python-magic with file-magic + * Mon Apr 28 2025 Dick Marinus - 0.11-6 - Add unittest From bb012e342b964ffd4563de7b604df5d5c5182101 Mon Sep 17 00:00:00 2001 From: Dick Marinus Date: Thu, 29 May 2025 15:21:12 +0200 Subject: [PATCH 13/20] Python 3.14 fixes --- 0001-Python-3.14-fixes.patch | 93 ++++++++++++++++++++++++++++++++++++ alot.spec | 1 + 2 files changed, 94 insertions(+) create mode 100644 0001-Python-3.14-fixes.patch diff --git a/0001-Python-3.14-fixes.patch b/0001-Python-3.14-fixes.patch new file mode 100644 index 0000000..bc59038 --- /dev/null +++ b/0001-Python-3.14-fixes.patch @@ -0,0 +1,93 @@ +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/alot.spec b/alot.spec index 0c8611f..9b3d1d1 100644 --- a/alot.spec +++ b/alot.spec @@ -8,6 +8,7 @@ License: GPL-3.0-or-later URL: https://github.com/pazz/alot Source0: %{url}/archive/%{version}/%{version}.tar.gz Patch: 0001-replace-python-magic-with-file-magic.patch +Patch: 0001-Python-3.14-fixes.patch BuildArch: noarch From 288ad7f60299207a6223917659d40c737c59fd11 Mon Sep 17 00:00:00 2001 From: Dick Marinus Date: Thu, 29 May 2025 15:40:15 +0200 Subject: [PATCH 14/20] update changelog --- alot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alot.spec b/alot.spec index 9b3d1d1..f638225 100644 --- a/alot.spec +++ b/alot.spec @@ -1,6 +1,6 @@ Name: alot Version: 0.11 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Experimental terminal MUA based on notmuch mail # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -55,6 +55,9 @@ install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/default %{python3_sitelib}/alot/defaults %changelog +* Thu May 29 2025 Dick Marinus - 0.11-8 +- Python 3.14 fixes + * Tue Apr 29 2025 Dick Marinus - 0.11-7 - Replace python-magic with file-magic From 945dba8c74eb7aabde0c51171d044d6d2778d7c8 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 4 Jun 2025 00:50:27 +0200 Subject: [PATCH 15/20] Rebuilt for Python 3.14 --- alot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alot.spec b/alot.spec index f638225..27fe3e0 100644 --- a/alot.spec +++ b/alot.spec @@ -1,6 +1,6 @@ Name: alot Version: 0.11 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Experimental terminal MUA based on notmuch mail # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -55,6 +55,9 @@ install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/default %{python3_sitelib}/alot/defaults %changelog +* Tue Jun 03 2025 Python Maint - 0.11-9 +- Rebuilt for Python 3.14 + * Thu May 29 2025 Dick Marinus - 0.11-8 - Python 3.14 fixes From 8d516bb16e872f66b9fb39eb19d866fd2fa58787 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:54:40 +0000 Subject: [PATCH 16/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- alot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alot.spec b/alot.spec index 27fe3e0..9b58744 100644 --- a/alot.spec +++ b/alot.spec @@ -1,6 +1,6 @@ Name: alot Version: 0.11 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Experimental terminal MUA based on notmuch mail # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -55,6 +55,9 @@ install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/default %{python3_sitelib}/alot/defaults %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 0.11-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Python Maint - 0.11-9 - Rebuilt for Python 3.14 From 22f4e4a912a67cbc984ede33780bdc9404cc31d4 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:37:40 +0200 Subject: [PATCH 17/20] Rebuilt for Python 3.14.0rc2 bytecode --- alot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alot.spec b/alot.spec index 9b58744..5e13340 100644 --- a/alot.spec +++ b/alot.spec @@ -1,6 +1,6 @@ Name: alot Version: 0.11 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Experimental terminal MUA based on notmuch mail # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -55,6 +55,9 @@ install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/default %{python3_sitelib}/alot/defaults %changelog +* Fri Aug 15 2025 Python Maint - 0.11-11 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Jul 23 2025 Fedora Release Engineering - 0.11-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a08d87a282d14e2dee6bdea30a4146af44fbe3d2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:06:43 +0200 Subject: [PATCH 18/20] Rebuilt for Python 3.14.0rc3 bytecode --- alot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alot.spec b/alot.spec index 5e13340..6b5b761 100644 --- a/alot.spec +++ b/alot.spec @@ -1,6 +1,6 @@ Name: alot Version: 0.11 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Experimental terminal MUA based on notmuch mail # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -55,6 +55,9 @@ install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/default %{python3_sitelib}/alot/defaults %changelog +* Fri Sep 19 2025 Python Maint - 0.11-12 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 0.11-11 - Rebuilt for Python 3.14.0rc2 bytecode From 6bc98fe984ab5adef02ed59f8d21940e937fd23c Mon Sep 17 00:00:00 2001 From: Dick Marinus Date: Thu, 11 Dec 2025 20:53:38 +0100 Subject: [PATCH 19/20] New upstream release 0.12 --- .gitignore | 1 + 0001-Python-3.14-fixes.patch | 93 ------------------- ...replace-python-magic-with-file-magic.patch | 10 +- alot.spec | 10 +- sources | 2 +- 5 files changed, 13 insertions(+), 103 deletions(-) delete mode 100644 0001-Python-3.14-fixes.patch 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 From 330fbb290a22b70898bd6e1d436ae00a789af0c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:36:13 +0000 Subject: [PATCH 20/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- alot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alot.spec b/alot.spec index 57cb5d1..2b55c88 100644 --- a/alot.spec +++ b/alot.spec @@ -1,6 +1,6 @@ Name: alot Version: 0.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Experimental terminal MUA based on notmuch mail # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -54,6 +54,9 @@ install -Dpm0644 alot/defaults/* -t %{buildroot}/%{python3_sitelib}/alot/default %{python3_sitelib}/alot/defaults %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 0.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Sat Dec 6 2025 Dick Marinus - 0.12-1 - New upstream release 0.12