Steve Kowalik
5e81b7edd9
* python, cli: drop six dependency * pylint: fix old import errors that appear as new * cli: add workaround for redirect download with accept list OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-copr-cli?expand=0&rev=21
71 lines
2.0 KiB
Diff
71 lines
2.0 KiB
Diff
---
|
|
copr-cli.spec | 4 ----
|
|
copr_cli/util.py | 4 ++--
|
|
setup.py | 1 -
|
|
3 files changed, 2 insertions(+), 7 deletions(-)
|
|
|
|
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
|
|
Requires: python3-jinja2
|
|
-Requires: python3-simplejson
|
|
Requires: python3-humanize
|
|
Requires: python3-koji
|
|
|
|
@@ -46,12 +45,10 @@ BuildRequires: python3-humanize
|
|
BuildRequires: python3-pytest
|
|
BuildRequires: python3-responses
|
|
BuildRequires: python3-setuptools
|
|
-BuildRequires: python3-simplejson
|
|
BuildRequires: python3-munch
|
|
%else
|
|
Requires: python-copr >= %min_python_copr_version
|
|
Requires: python-jinja2
|
|
-Requires: python-simplejson
|
|
Requires: 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
|
|
%endif
|
|
|
|
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
|
|
|
|
import humanize
|
|
-import simplejson
|
|
+import json
|
|
|
|
|
|
try:
|
|
@@ -66,4 +66,4 @@ def serializable(result):
|
|
|
|
|
|
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)
|
|
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',
|
|
'humanize',
|
|
- 'simplejson',
|
|
'jinja2',
|
|
'setuptools',
|
|
]
|