[rpms/jrnl] f43: Update to 4.3 (close RHBZ#2442437)

[rpms/jrnl] f43: Update to 4.3 (close RHBZ#2442437)

[Benjamin A. Beasley]

A new commit has been pushed.

Repo   : rpms/jrnl
Branch : f43
Commit : 27073af789daffeb56d86464325b922e5f6587b3
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-08-07T17:07:41+01:00
Stats  : +65/-175 in 8 file(s)
URL    : https://src.fedoraproject.org/rpms/jrnl/c/27073af789daffeb56d86464325b922e5f6587b3?branch=f43

Log:
Update to 4.3 (close RHBZ#2442437)

---
diff --git a/.gitignore b/.gitignore
index 7af9fcb..7677da5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /jrnl-4.1.tar.gz
 /jrnl-4.2.tar.gz
 /jrnl-4.2.1.tar.gz
+/jrnl-4.3.tar.gz

diff --git a/0001-Downstream-only-do-not-upper-bound-the-Python-interp.patch b/0001-Downstream-only-do-not-upper-bound-the-Python-interp.patch
index 466a254..e9dc704 100644
--- a/0001-Downstream-only-do-not-upper-bound-the-Python-interp.patch
+++ b/0001-Downstream-only-do-not-upper-bound-the-Python-interp.patch
@@ -1,8 +1,8 @@
-From f207e369f17f3e2d3c7c229fef9aa4cfab1f0227 Mon Sep 17 00:00:00 2001
+From 7acb614de1610ea6eb821a76f04bf501ea6ab2a2 Mon Sep 17 00:00:00 2001
 From: "Benjamin A. Beasley" <code@musicinmybrain.net>
 Date: Thu, 2 May 2024 10:30:25 -0400
-Subject: [PATCH] Downstream-only: do not upper-bound the Python interpreter
- version
+Subject: [PATCH 1/2] Downstream-only: do not upper-bound the Python
+ interpreter version
 
 We must integrate with new Python interpreter versions whether upstream
 is ready or not.
@@ -11,18 +11,18 @@ is ready or not.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/pyproject.toml b/pyproject.toml
-index e396e42..21817b4 100644
+index f945424..efa6057 100644
 --- a/pyproject.toml
 +++ b/pyproject.toml
-@@ -27,7 +27,7 @@ classifiers = [
- "Funding" = "https://opencollective.com/jrnl"
- 
- [tool.poetry.dependencies]
--python = ">=3.10.0, <3.14"
-+python = ">=3.10.0"
- 
- colorama = ">=0.4"       # https://github.com/tartley/colorama/blob/master/CHANGELOG.rst
- cryptography = ">=3.0"   # https://cryptography.io/en/latest/api-stability.html
+@@ -11,7 +11,7 @@ authors = [
+   {name = "jrnl contributors", email = "maintainers@jrnl.sh"}
+ ]
+ maintainers = [{name = "Jonathan Wren and Micah Ellison", email = "maintainers@jrnl.sh"}]
+-requires-python = '>=3.10.0,<3.15'
++requires-python = '>=3.10.0'
+ dependencies = [
+   'colorama (>=0.4)', # https://github.com/tartley/colorama/blob/master/CHANGELOG.rst
+   'cryptography (>=3.0)', # https://cryptography.io/en/latest/api-stability.html
 -- 
-2.47.0
+2.53.0
 

diff --git a/0001-For-Python-3.11-use-tomllib-for-tests.patch b/0001-For-Python-3.11-use-tomllib-for-tests.patch
deleted file mode 100644
index c3052a8..0000000
--- a/0001-For-Python-3.11-use-tomllib-for-tests.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From cfb82ff6cd74fe15b91f0b2a2ab7804bd023cbc5 Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Fri, 15 Aug 2025 10:33:31 -0400
-Subject: [PATCH] For Python 3.11, use `tomllib` for tests
-
-Avoid a test dependency on the PyPI `toml` package.
----
- pyproject.toml        |  4 ++--
- tests/lib/fixtures.py | 14 +++++++++++---
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index cfa1e90..439e469 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -53,7 +53,7 @@ pytest-clarity = "*"
- pytest-xdist = ">=2.5.0"
- requests = "*"
- ruff = ">=0.0.276"
--toml = ">=0.10"
-+toml = { version = ">=0.10", markers = "python_version < '3.11'" }
- tox = "*"
- xmltodict = "*"
- 
-@@ -173,7 +173,7 @@ deps =
-   pytest-bdd >=8.0
-   pytest-xdist >=2.5.0
-   parse-type >=0.6.0
--  toml >=0.10
-+  toml >=0.10; python_version < '3.11'
- 
- commands = pytest {posargs}
- passenv = HOME
-diff --git a/tests/lib/fixtures.py b/tests/lib/fixtures.py
-index 168a800..103da29 100644
---- a/tests/lib/fixtures.py
-+++ b/tests/lib/fixtures.py
-@@ -2,6 +2,7 @@
- # License: https://www.gnu.org/licenses/gpl-3.0.html
- 
- import os
-+import sys
- import tempfile
- from collections import defaultdict
- from collections.abc import Iterable
-@@ -9,7 +10,6 @@ from pathlib import Path
- from unittest.mock import Mock
- from unittest.mock import patch
- 
--import toml
- from keyring import backend
- from keyring import errors
- from pytest import fixture
-@@ -203,8 +203,16 @@ def working_dir(request):
- 
- @fixture
- def toml_version(working_dir):
--    pyproject = os.path.join(working_dir, "..", "pyproject.toml")
--    pyproject_contents = toml.load(pyproject)
-+    pyproject_path = os.path.join(working_dir, "..", "pyproject.toml")
-+    if sys.version_info >= (3, 11):
-+        import tomllib
-+
-+        with open(pyproject_path, "rb") as pyproject:
-+            pyproject_contents = tomllib.load(pyproject)
-+    else:
-+        import toml
-+
-+        pyproject_contents = toml.load(pyproject_path)
-     return pyproject_contents["tool"]["poetry"]["version"]
- 
- 
--- 
-2.50.1
-

diff --git a/0002-Downstream-only-do-not-upper-bound-the-version-of-ri.patch b/0002-Downstream-only-do-not-upper-bound-the-version-of-ri.patch
new file mode 100644
index 0000000..fe73279
--- /dev/null
+++ b/0002-Downstream-only-do-not-upper-bound-the-version-of-ri.patch
@@ -0,0 +1,29 @@
+From 78827316e4caf0389350cfe6bcb950caf94a1487 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Thu, 26 Feb 2026 05:19:07 +0000
+Subject: [PATCH 2/2] Downstream-only: do not upper-bound the version of rich
+
+Upstream limits this to the current minor version, but we must integrate
+with new releases whether upstream is ready or not. We would rather deal
+with a few possible, usually-minor test failures than a sudden failure
+to install.
+---
+ pyproject.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index efa6057..0258e01 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -21,7 +21,7 @@ dependencies = [
+   'pyxdg (>=0.27.0)',
+   'ruamel.yaml (>=0.17.22)',
+   'ruamel.yaml.clib (>=0.2.12)', # https://sourceforge.net/p/ruamel-yaml-clib/tickets/36/
+-  'rich (>=14.3.2,<14.4.0)',
++  'rich (>=14.1.0)',
+   'tzlocal (>=4.0)' # https://github.com/regebro/tzlocal/blob/master/CHANGES.txt
+ ]
+ 
+-- 
+2.53.0
+

diff --git a/2047.patch b/2047.patch
deleted file mode 100644
index 5840095..0000000
--- a/2047.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b6e90a8c3d68f955830335582b162e60722c2daf Mon Sep 17 00:00:00 2001
-From: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
-Date: Sat, 14 Feb 2026 07:09:51 -0800
-Subject: [PATCH] Modify test to bypass minor inconsistency between Python
- versions
-
----
- tests/bdd/features/override.feature | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/tests/bdd/features/override.feature b/tests/bdd/features/override.feature
-index 2a85bec98..bd7e8546e 100644
---- a/tests/bdd/features/override.feature
-+++ b/tests/bdd/features/override.feature
-@@ -28,18 +28,22 @@ Feature: Implementing Runtime Overrides for Select Configuration Keys
-         Given we use the config "simple.yaml"
-         And we use the password "test" if prompted
-         When we run "jrnl  -2 --config-override linewrap 23 --format fancy"
--        Then the output should be
-+        Then the standard output should contain
-             """
-             ┎─────╮2013-06-09 15:39
-             ┃ My  ╘═══════════════╕
--            ┃ fir st  ent ry.     │
-+            """
-+        And the standard output should contain
-+            """
-             ┠╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┤
-             ┃ Everything is       │
-             ┃ alright             │
-             ┖─────────────────────┘
-             ┎─────╮2013-06-10 15:40
-             ┃ Lif ╘═══════════════╕
--            ┃ e is  goo d.        │
-+            """
-+        And the standard output should contain
-+            """
-             ┠╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┤
-             ┃ But I'm better.     │
-             ┖─────────────────────┘

diff --git a/jrnl-4.2-rich-14.patch b/jrnl-4.2-rich-14.patch
deleted file mode 100644
index 679a8a4..0000000
--- a/jrnl-4.2-rich-14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index cfa1e90db..538cbbc83 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -36,7 +36,7 @@ parsedatetime = ">=2.6"
- python-dateutil = "^2.8" # https://github.com/dateutil/dateutil/blob/master/RELEASING
- pyxdg = ">=0.27.0"
- "ruamel.yaml" = ">=0.17.22"
--rich = ">=12.2.0, <14.0.0"
-+rich = ">=14.1, <15.0"
- 
- # dayone-only deps
- tzlocal = ">=4.0"   # https://github.com/regebro/tzlocal/blob/master/CHANGES.txt

diff --git a/jrnl.spec b/jrnl.spec
index c9534df..1f70303 100644
--- a/jrnl.spec
+++ b/jrnl.spec
@@ -1,5 +1,5 @@
 Name:           jrnl
-Version:        4.2.1
+Version:        4.3
 Release:        %autorelease
 Summary:        Collect your thoughts and notes without leaving the command line
 
@@ -13,30 +13,16 @@ Source:         %{forgeurl}/archive/v%{version}/jrnl-%{version}.tar.gz
 # We must integrate with new Python interpreter versions whether upstream
 # is ready or not.
 Patch:          0001-Downstream-only-do-not-upper-bound-the-Python-interp.patch
-
-# Update dependency rich to v14
-# https://github.com/jrnl-org/jrnl/pull/1989
-# Update dependency rich to >=14.1.0, <14.2.0
-# https://github.com/jrnl-org/jrnl/pull/2013
+# Downstream-only: do not upper-bound the version of rich
 #
-# We have combined the two mentioned PR’s and modified the patch to include
-# only changes to pyproject.toml, omitting those to poetry.lock since they are
-# unnecessary (for Fedora) and likely to cause conflicts. Furthermore, we have
-# widened the ersion range as suggested upstream in
-# https://github.com/jrnl-org/jrnl/pull/2013#issuecomment-3146456826.
-Patch:          jrnl-4.2-rich-14.patch
-
-# For Python 3.11, use `tomllib` for tests
-# https://github.com/jrnl-org/jrnl/pull/2028
-# Rebased on v4.2.1, without changes to poetry.lock.
-Patch:          0001-For-Python-3.11-use-tomllib-for-tests.patch
-
-# Modify linewrap test to bypass minor inconsistency between Python versions
-# https://github.com/jrnl-org/jrnl/pull/2047
-Patch:          %{forgeurl}/pull/2047.patch
+# Upstream limits this to the current minor version, but we must integrate
+# with new releases whether upstream is ready or not. We would rather deal
+# with a few possible, usually-minor test failures than a sudden failure
+# to install.
+Patch:          0002-Downstream-only-do-not-upper-bound-the-version-of-ri.patch
 
 BuildSystem:            pyproject
-BuildOption(install):   jrnl
+BuildOption(install):   -L jrnl
 BuildOption(generate_buildrequires): -t
 
 BuildArch:      noarch
@@ -53,9 +39,6 @@ encryption.
 
 
 %prep -a
-# Unpin pytest; see https://github.com/jrnl-org/jrnl/issues/1879.
-sed -r -i 's/(pytest\b.*),<=?[[:digit:].]+/\1/' pyproject.toml
-
 dos2unix --keepdate \
     SECURITY.md \
     docs/external-editors.md \
@@ -64,23 +47,28 @@ dos2unix --keepdate \
     docs/reference-config-file.md
 
 
-%build -a
+%install -a
 # https://github.com/jrnl-org/jrnl/issues/74
 # https://github.com/jrnl-org/jrnl/issues/1274
-help2man --no-info '%{python3} -m jrnl' --output='jrnl.1'
-
-
-%install -a
-install -D -t '%{buildroot}%{_mandir}/man1' -p -m 0644 'jrnl.1'
+install -d '%{buildroot}%{_mandir}/man1'
+%{py3_test_envvars} help2man --no-info jrnl \
+    --output='%{buildroot}%{_mandir}/man1/jrnl.1'
 
 
 %check -a
+# https://github.com/jrnl-org/jrnl/issues/2060#issuecomment-3964203676
+k="${k-}${k+ and }not test_install_jrnl_with_custom_expanded_default_journal_path"
+k="${k-}${k+ and }not test_install_jrnl_with_custom_relative_default_journal_path"
+k="${k-}${k+ and }not test_install_jrnl_with_default_options"
+k="${k-}${k+ and }not test_install_jrnl_with_encrypted_default_journal"
+k="${k-}${k+ and }not test_install_jrnl_with_encrypted_default_journal_with_no_entries"
+k="${k-}${k+ and }not test_update_version_number_in_config_file_when_running_newer_version"
+
 %tox -- -- -k "${k-}" -rs
 
 
 %files -f %{pyproject_files}
 %license LICENSE.md
-
 %doc CHANGELOG.md
 %doc README.md
 %doc docs/

diff --git a/sources b/sources
index 225a6c2..63e4db3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jrnl-4.2.1.tar.gz) = dd2a1aebb336f1457415bbb43a8338357db3c70a1f021486af4d8e567c6384f3e8c0c815e7bf713db9d0d61cf230d67528d4d03ce1aec692b7a8c963728c2ce8
+SHA512 (jrnl-4.3.tar.gz) = eb8189dc2fe2fcfbb176886f665a207ba20119530faf7fda63f5023c5451964ca250b94ecdbd06f4abb1ee2a146a30039d6da5ce26b35b13bf14950e2418b6fe