diff --git a/dictknife-0.13.0.tar.gz b/dictknife-0.13.0.tar.gz deleted file mode 100644 index d0c221b..0000000 --- a/dictknife-0.13.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92a8ae60ded782d09ce2f7d89984455b6a8e2d2e9c547b7f4502db8f4ab47787 -size 97791 diff --git a/dictknife-0.14.0.tar.gz b/dictknife-0.14.0.tar.gz new file mode 100644 index 0000000..0cd332d --- /dev/null +++ b/dictknife-0.14.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6184f7ff0637f0a0fb94e3b834fbfdd271f1f35d81a795740c76a4d15406c5be +size 100587 diff --git a/python-dictknife.changes b/python-dictknife.changes index 07713b3..8b62393 100644 --- a/python-dictknife.changes +++ b/python-dictknife.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Dec 2 14:18:06 UTC 2023 - Dirk Müller + +- update to 0.14.0: + * use tomlkit instead of qtoml + * use ruamel.yaml instead of pyyaml (for preserving comments) + * add `dictknife diff -o pair` + ------------------------------------------------------------------- Thu Apr 14 19:15:20 UTC 2022 - Ben Greiner diff --git a/python-dictknife.spec b/python-dictknife.spec index 521f382..e91ba04 100644 --- a/python-dictknife.spec +++ b/python-dictknife.spec @@ -1,7 +1,7 @@ # # spec file for package python-dictknife # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,36 +16,33 @@ # -%{?!python_module:%define python_module() python3-%{**}} -%define skip_python2 1 +%{?sle15_python_module_pythons} Name: python-dictknife -Version: 0.13.0 +Version: 0.14.0 Release: 0 Summary: Army knife of handling data License: MIT URL: https://github.com/podhmo/dictknife Source: https://github.com/podhmo/dictknife/archive/%{version}.tar.gz#/dictknife-%{version}.tar.gz Patch0: support-python-310.patch -BuildRequires: %{python_module PyYAML} BuildRequires: %{python_module google-api-python-client} BuildRequires: %{python_module google-auth-oauthlib} BuildRequires: %{python_module jsonpatch} BuildRequires: %{python_module magicalimport} BuildRequires: %{python_module prestring} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module ruamel.yaml} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires(post): update-alternatives Requires(postun):update-alternatives -Suggests: python-PyYAML +Suggests: python-ruamel.yaml Suggests: python-google-api-python-client Suggests: python-google-auth-oauthlib Suggests: python-jsonpatch Suggests: python-magicalimport Suggests: python-prestring -# Not available -Suggests: python-qtoml BuildArch: noarch %python_subpackages @@ -83,7 +80,7 @@ JSON pointer syntax. %pytest %files %{python_files} -%doc README.rst +%doc README.md %license LICENSE %python_alternative %{_bindir}/dictknife %python_alternative %{_bindir}/jsonknife diff --git a/support-python-310.patch b/support-python-310.patch index dfea071..370b525 100644 --- a/support-python-310.patch +++ b/support-python-310.patch @@ -1,7 +1,7 @@ -Index: dictknife-0.13.0/dictknife/tests/cliutils/test_extraarguments.py +Index: dictknife-0.14.0/dictknife/tests/cliutils/test_extraarguments.py =================================================================== ---- dictknife-0.13.0.orig/dictknife/tests/cliutils/test_extraarguments.py -+++ dictknife-0.13.0/dictknife/tests/cliutils/test_extraarguments.py +--- dictknife-0.14.0.orig/dictknife/tests/cliutils/test_extraarguments.py ++++ dictknife-0.14.0/dictknife/tests/cliutils/test_extraarguments.py @@ -1,3 +1,4 @@ +import sys import textwrap @@ -13,13 +13,13 @@ Index: dictknife-0.13.0/dictknife/tests/cliutils/test_extraarguments.py def test_help_message(self): + ending = "al arguments" + if sys.version_info >= (3, 10): -+ ending ="s" ++ ending = "s" target = self._makeOne() expected = textwrap.dedent( """ usage: cmd [-h] -- optional arguments: +- options: + option%s: -h, --help show this help message and exit @@ -27,7 +27,7 @@ Index: dictknife-0.13.0/dictknife/tests/cliutils/test_extraarguments.py for --format=json: --sort-keys sort keys - """ -+ """ % (ending,) ++ """ % (ending, ) ).strip() actual = target.parser.format_help().strip()