Compare commits
7 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 5fd4924868 | |||
| 11ebbfb562 | |||
| 684b5401d0 | |||
| 327379c8b1 | |||
| 14a2ad905b | |||
| c1dc20b9b6 | |||
| e246ebb3b7 |
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1274a41d195adcebbe683b4c15b2565b35dcfccae0e6fed206f1d27ef701d5bc
|
||||
size 66350
|
||||
3
copr-cli-2.1.tar.gz
Normal file
3
copr-cli-2.1.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:23c1f0665cee13d5812ba34e3975bf0c474ef98f2ac8215facf29b8921e09188
|
||||
size 64846
|
||||
@@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 7 09:33:49 UTC 2025 - Markéta Machová <mmachova@suse.com>
|
||||
|
||||
- Convert to libalternatives
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 7 13:52:02 UTC 2025 - Markéta Machová <mmachova@suse.com>
|
||||
|
||||
- update to 2.1
|
||||
* python, cli: drop six dependency
|
||||
* pylint: fix old import errors that appear as new
|
||||
* cli: add workaround for redirect download with accept list
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 12 21:00:03 UTC 2024 - Richard Rahl <rrahl0@opensuse.org>
|
||||
|
||||
- update to 2.0:
|
||||
* no upstream changelog
|
||||
- remove remove-simplejson.patch, as upstream removed simplejson
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 20 13:40:42 UTC 2024 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-copr-cli
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -16,22 +16,21 @@
|
||||
#
|
||||
|
||||
|
||||
%bcond_without libalternatives
|
||||
Name: python-copr-cli
|
||||
Version: 1.111
|
||||
Version: 2.1
|
||||
Release: 0
|
||||
Summary: Copr cli
|
||||
License: GPL-2.0-or-later
|
||||
URL: https://github.com/fedora-copr/copr
|
||||
Source: https://files.pythonhosted.org/packages/source/c/copr-cli/copr-cli-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM remove-simplejson.patch gh#fedora-copr/copr#2539 mcepl@suse.com
|
||||
# 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: alts
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python-rpm-macros
|
||||
Requires: alts
|
||||
Requires: python-Jinja2
|
||||
Requires: python-copr >= 1.116
|
||||
Requires: python-humanize
|
||||
@@ -44,8 +43,6 @@ BuildRequires: %{python_module humanize}
|
||||
BuildRequires: %{python_module pytest}
|
||||
BuildRequires: %{python_module responses}
|
||||
# /SECTION
|
||||
Requires(post): update-alternatives
|
||||
Requires(postun): update-alternatives
|
||||
%python_subpackages
|
||||
|
||||
%description
|
||||
@@ -67,11 +64,8 @@ sed -i '1{/#!/d}' copr_cli/package_build_order.py
|
||||
%check
|
||||
%pytest
|
||||
|
||||
%post
|
||||
%python_install_alternative copr-cli
|
||||
|
||||
%postun
|
||||
%python_uninstall_alternative copr-cli
|
||||
%pre
|
||||
%python_libalternatives_reset_alternative copr-cli
|
||||
|
||||
%files %{python_files}
|
||||
%license LICENSE
|
||||
|
||||
@@ -1,70 +0,0 @@
|
||||
---
|
||||
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',
|
||||
]
|
||||
Reference in New Issue
Block a user