public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/python-toml-cli] rawhide: Fix F45FTBFS with 0.8.2
@ 2026-08-06  0:23 Filipe Rosset
  0 siblings, 0 replies; only message in thread
From: Filipe Rosset @ 2026-08-06  0:23 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/python-toml-cli
Branch : rawhide
Commit : 76a9ce1beff8efd6edd65338f317ae7d7a09347a
Author : Filipe Rosset <rosset.filipe@gmail.com>
Date   : 2026-08-05T21:23:14-03:00
Stats  : +41/-10 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/python-toml-cli/c/76a9ce1beff8efd6edd65338f317ae7d7a09347a?branch=rawhide

Log:
Fix F45FTBFS with 0.8.2

---
diff --git a/.gitignore b/.gitignore
index b9cc756..c3f02fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/toml-cli-0.7.0.tar.gz
-/toml-cli-0.8.2.tar.gz
+/toml-cli-*.tar.gz

diff --git a/0002-lower-tomlkit-dependency.patch b/0002-lower-tomlkit-dependency.patch
new file mode 100644
index 0000000..8fe6655
--- /dev/null
+++ b/0002-lower-tomlkit-dependency.patch
@@ -0,0 +1,12 @@
+diff -urN a/pyproject.toml b/pyproject.toml
+--- a/pyproject.toml	2026-08-05 21:00:00.000000000 +0000
++++ b/pyproject.toml	2026-08-05 21:00:00.000000000 +0000
+@@ -9,7 +9,7 @@
+ dependencies = [
+     "jmespath>=1.0.1",
+     "regex>=2020.7.14",
+-    "tomlkit>=0.13.3",
++    "tomlkit>=0.13.2",
+     "typer>=0.16.0",
+ ]
+ authors = [{ name = "Marc Rijken", email = "marc@rijken.org" }]

diff --git a/0003-skip-out-of-order-table-test-on-older-tomlkit.patch b/0003-skip-out-of-order-table-test-on-older-tomlkit.patch
new file mode 100644
index 0000000..2342b3c
--- /dev/null
+++ b/0003-skip-out-of-order-table-test-on-older-tomlkit.patch
@@ -0,0 +1,16 @@
+diff -urN a/tests/toml_cli/test_init.py b/tests/toml_cli/test_init.py
+--- a/tests/toml_cli/test_init.py	2026-08-05 21:00:00.000000000 +0000
++++ b/tests/toml_cli/test_init.py	2026-08-05 21:00:00.000000000 +0000
+@@ -262,6 +262,12 @@
+ 
+ 
+ def test_set_in_out_of_order_table(tmp_path: pathlib.Path):
++    import pytest
++    import tomlkit
++    from packaging.version import Version
++    if Version(tomlkit.__version__) < Version("0.13.3"):
++        pytest.skip("tomlkit < 0.13.3 does not support set in out-of-order tables correctly")
++
+     test_toml_path = tmp_path / "test.toml"
+     test_toml_path.write_text(
+         """

diff --git a/python-toml-cli.spec b/python-toml-cli.spec
index 029c678..11f563e 100644
--- a/python-toml-cli.spec
+++ b/python-toml-cli.spec
@@ -1,15 +1,19 @@
-Name:           python-toml-cli
+%global forgeurl https://github.com/mrijken/toml-cli
 Version:        0.8.2
+%forgemeta
+
+Name:           python-toml-cli
 Release:        %autorelease
 Summary:        Read and write keys/values to/from toml files
 
-License:        MIT
-URL:            https://github.com/mrijken/toml-cli
-# PyPI tarball doesn't include tests
-Source:         %{url}/archive/v%{version}/toml-cli-%{version}.tar.gz
-# Fix test compatibility with Click 8.2+ / Typer 0.16.0+ where
-# CliRunner separates stdout/stderr and no-args-is-help returns exit code 2
-Patch:          0001-fix-tests-click-typer-compatibility.patch
+License:        Apache-2.0
+URL:            %{forgeurl}
+Source:         %{forgesource}
+
+# Lower tomlkit dependency to match Fedora Rawhide (0.13.2)
+Patch0:         0002-lower-tomlkit-dependency.patch
+# Skip test_set_in_out_of_order_table on tomlkit < 0.13.3 due to lack of upstream fix
+Patch1:         0003-skip-out-of-order-table-test-on-older-tomlkit.patch
 
 BuildArch:      noarch
 BuildRequires:  python3-devel

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-06  0:23 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-06  0:23 [rpms/python-toml-cli] rawhide: Fix F45FTBFS with 0.8.2 Filipe Rosset

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox