python/python-dictknife
SHA256
15
0
Fork 0
forked from pool/python-dictknife
Code Pull Requests Activity

- Add patch support-python-310.patch:

Browse Source 
* Support Python 3.10.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-dictknife?expand=0&rev=5
This commit is contained in:
Steve Kowalik
2022-02-03 01:39:35 +00:00
committed by Git OBS Bridge
parent 032b8ace45
commit 736bc3df7d
3 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python-dictknife.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 3 01:38:47 UTC 2022 - Steve Kowalik <steven.kowalik@suse.com>
- Add patch support-python-310.patch:
* Support Python 3.10.
-------------------------------------------------------------------
Mon Dec 13 13:55:39 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>

10
python-dictknife.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package python-dictknife
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,8 @@
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%{?!python_module:%define python_module() python3-%{**}}
%define skip_python2 1
%define skip_python36 1
Name: python-dictknife
Version: 0.13.0
Release: 0
@@ -26,6 +25,7 @@ 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 jsonpatch}
@@ -38,7 +38,7 @@ BuildRequires: %{python_module toml}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires(post): update-alternatives
Requires(postun): update-alternatives
Requires(postun):update-alternatives
Suggests: python-PyYAML
Suggests: python-google-api-python-client
Suggests: python-jsonpatch
@@ -57,7 +57,7 @@ Includes jsonknife for splitting files and dereferencing JSON using
JSON pointer syntax.
%prep
%setup -q -n dictknife-%{version}
%autosetup -p1 -n dictknife-%{version}
%build
%python_build

33
support-python-310.patch Normal file
View File

@@ -0,0 +1,33 @@
Index: dictknife-0.13.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
@@ -1,3 +1,4 @@
+import sys
import textwrap
import unittest
@@ -22,18 +23,21 @@ class Tests(unittest.TestCase):
return target
def test_help_message(self):
+ ending = "al arguments"
+ if sys.version_info >= (3, 10):
+ ending ="s"
target = self._makeOne()
expected = textwrap.dedent(
"""
usage: cmd [-h]
- optional arguments:
+ option%s:
-h, --help show this help message and exit
extra arguments: (with --extra<option>)
for --format=json:
--sort-keys sort keys
- """
+ """ % (ending,)
).strip()
actual = target.parser.format_help().strip()