15
0

Accepting request 1109655 from devel:languages:python

- 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/request/show/1109655
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-copr-cli?expand=0&rev=7
This commit is contained in:
2023-09-08 19:15:50 +00:00
committed by Git OBS Bridge
5 changed files with 37 additions and 27 deletions

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7443d749b759a88585cdbe94856bafe40f7f00dd9421ecf7d54162b398fd031a
size 64301

3
copr-cli-1.110.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d73f058128e0b828b31bd38bf7bb1e7ad8e79dfd9a268b42bc0896761e9e441d
size 64074

View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Sep 8 05:03:19 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
- Update to 1.110:
* No upstream changelog.
- Fiddle with {Build,}Requires as appropiate.
- Switch to pyproject macros.
- Refresh patch remove-simplejson.patch
-------------------------------------------------------------------
Fri Feb 10 22:45:01 UTC 2023 - Matej Cepl <mcepl@suse.com>

View File

@@ -17,7 +17,7 @@
Name: python-copr-cli
Version: 1.105
Version: 1.110
Release: 0
Summary: Copr cli
License: GPL-2.0-or-later
@@ -27,25 +27,21 @@ Source: https://files.pythonhosted.org/packages/source/c/copr-cli/copr-c
# Remove dependency on simplejson
# (not upstream, which on master switched to ujson)
Patch0: remove-simplejson.patch
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-Jinja2
Requires: python-copr >= 1.116
Requires: python-filelock
Requires: python-future
Requires: python-humanize
Requires: python-requests-gssapi
Requires: python-responses
Requires: python-setuptools
BuildArch: noarch
# SECTION test requirements
BuildRequires: %{python_module Jinja2}
BuildRequires: %{python_module copr >= 1.116}
BuildRequires: %{python_module filelock}
BuildRequires: %{python_module future}
BuildRequires: %{python_module humanize}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module requests-gssapi}
BuildRequires: %{python_module responses}
# /SECTION
Requires(post): update-alternatives
@@ -61,10 +57,10 @@ CLI tool to run copr.
sed -i '1{/#!/d}' copr_cli/package_build_order.py
%build
%python_build
%pyproject_wheel
%install
%python_install
%pyproject_install
%python_clone -a %{buildroot}%{_bindir}/copr-cli
%python_expand %fdupes %{buildroot}%{$python_sitelib}
@@ -81,6 +77,6 @@ sed -i '1{/#!/d}' copr_cli/package_build_order.py
%license LICENSE
%python_alternative %{_bindir}/copr-cli
%{python_sitelib}/copr_cli
%{python_sitelib}/copr_cli-%{version}*-info
%{python_sitelib}/copr_cli-%{version}.dist-info
%changelog

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',
]