15
0

- Update to 1.110:

* No upstream changelog.
- Fiddle with {Build,}Requires as appropiate.
- Switch to pyproject macros.
- Refresh patch remove-simplejson.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-copr-cli?expand=0&rev=15
This commit is contained in:
2023-09-08 05:03:45 +00:00
committed by Git OBS Bridge
parent 49ca9661fb
commit ce7ef06fd0
5 changed files with 37 additions and 27 deletions

View File

@@ -4,8 +4,10 @@
setup.py | 1 -
3 files changed, 2 insertions(+), 7 deletions(-)
--- a/copr-cli.spec
+++ b/copr-cli.spec
Index: copr-cli-1.110/copr-cli.spec
===================================================================
--- copr-cli-1.110.orig/copr-cli.spec
+++ copr-cli-1.110/copr-cli.spec
@@ -32,7 +32,6 @@ BuildRequires: util-linux
%if %{with python3}
Requires: python3-copr >= %min_python_copr_version
@@ -13,31 +15,32 @@
-Requires: python3-simplejson
Requires: python3-humanize
Requires: python3-koji
Requires: python3-future
@@ -47,13 +46,11 @@ BuildRequires: python3-humanize
@@ -46,12 +45,10 @@ BuildRequires: python3-humanize
BuildRequires: python3-pytest
BuildRequires: python3-responses
BuildRequires: python3-setuptools
-BuildRequires: python3-simplejson
BuildRequires: python3-munch
BuildRequires: python3-future
%else
Requires: python-copr >= %min_python_copr_version
Requires: python-jinja2
-Requires: python-simplejson
Requires: python-humanize
Requires: python-future
@@ -65,7 +62,6 @@ BuildRequires: python-humanize
BuildRequires: pytest
@@ -62,7 +59,6 @@ BuildRequires: python-humanize
BuildRequires: python-mock
BuildRequires: python2-responses
BuildRequires: python-setuptools
-BuildRequires: python-simplejson
BuildRequires: python-munch
BuildRequires: python-future
%endif
--- a/copr_cli/util.py
+++ b/copr_cli/util.py
Index: copr-cli-1.110/copr_cli/util.py
===================================================================
--- copr-cli-1.110.orig/copr_cli/util.py
+++ copr-cli-1.110/copr_cli/util.py
@@ -1,7 +1,7 @@
# coding: utf-8
@@ -53,8 +56,10 @@
def json_dumps(result):
- return simplejson.dumps(serializable(result), indent=4, sort_keys=True, for_json=True)
+ return json.dumps(serializable(result), indent=4, sort_keys=True)
--- a/setup.py
+++ b/setup.py
Index: copr-cli-1.110/setup.py
===================================================================
--- copr-cli-1.110.orig/setup.py
+++ copr-cli-1.110/setup.py
@@ -16,7 +16,6 @@ This part is a command line interface to
requires = [
'copr',
@@ -62,4 +67,4 @@
- 'simplejson',
'jinja2',
'setuptools',
'future',
]