Compare commits
26 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a17ed5f7f2 | ||
|
|
b59d31b484 | ||
|
|
6a2599e9b5 | ||
|
84c78d6fc0 |
|||
|
|
5b6571e393 | ||
|
|
eaf0b71c13 | ||
|
|
41e5f63540 | ||
|
|
479023fd96 | ||
|
|
baca4c2c07 | ||
|
|
8e40131197 | ||
|
|
36bf72856c | ||
|
|
5a9dc27fc8 | ||
|
|
0a18b36294 | ||
|
|
d1b5a5a645 | ||
|
|
b8b694094d | ||
|
|
a5b8c7bf1a | ||
|
|
ac54f85fe9 | ||
|
|
7a88fcfea3 | ||
|
|
c15da93d9f | ||
|
|
0ae12dd0a6 | ||
|
|
a600cf6f3a | ||
|
|
c9d1ec42dd | ||
|
|
0faf4c27ad | ||
|
|
c28f30c79f | ||
|
|
0943167d27 | ||
|
|
d03d3ae541 |
4 changed files with 211 additions and 22 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -4,3 +4,7 @@
|
|||
/ursa-major-0.2.2.tar.gz
|
||||
/ursa-major-0.3.1.tar.gz
|
||||
/ursa-major-0.4.1.tar.gz
|
||||
/ursa-major-0.4.2.tar.gz
|
||||
/ursa-major-0.4.3.tar.gz
|
||||
/ursa-major-0.5.0.tar.gz
|
||||
/ursa-major-0.5.1.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (ursa-major-0.4.1.tar.gz) = 7fbe6cc580ab6f256ab8d7866da677a8cebbe819b7d33f3bb83b041de5a143d2899460d27c650e77cc6704296ea9150e0ffa5c59af8136781b20544e85cdd652
|
||||
SHA512 (ursa-major-0.5.1.tar.gz) = b738436e34301f7e7e7ee29bf2969826875f7ec9256e797e53e049f1092efeeb055f39e929c2d6cf9b99b4634b6e4eaa7ae3087f54b623d28f23f0f1b2907ea0
|
||||
|
|
|
|||
97
ursa-major-rm-python-mock-usage.diff
Normal file
97
ursa-major-rm-python-mock-usage.diff
Normal file
|
|
@ -0,0 +1,97 @@
|
|||
--- a/test-requirements.txt
|
||||
+++ b/test-requirements.txt
|
||||
@@ -1,6 +1,5 @@
|
||||
-r requirements.txt
|
||||
|
||||
-mock
|
||||
pytest
|
||||
pytest-cov
|
||||
tox
|
||||
--- a/tests/test_add_module.py
|
||||
+++ b/tests/test_add_module.py
|
||||
@@ -28,7 +28,7 @@ import six
|
||||
import tempfile
|
||||
import unittest
|
||||
from argparse import Namespace
|
||||
-from mock import patch
|
||||
+from unittest.mock import patch
|
||||
from tests import TEST_DATA_DIR, MockMBSBuildsData, make_mmd, dump_mmd
|
||||
from ursa_major.handlers.add_module import AddModuleHandler
|
||||
if six.PY3: # SafeConfigParser == ConfigParser, former deprecated in >= 3.2
|
||||
--- a/tests/test_check_config.py
|
||||
+++ b/tests/test_check_config.py
|
||||
@@ -26,7 +26,7 @@ import os
|
||||
import pytest
|
||||
import tempfile
|
||||
|
||||
-from mock import call, patch
|
||||
+from unittest.mock import call, patch
|
||||
from tests import TEST_DATA_DIR, MockMBSBuildsData, make_mmd, dump_mmd
|
||||
from ursa_major.cli import main
|
||||
|
||||
--- a/tests/test_cli.py
|
||||
+++ b/tests/test_cli.py
|
||||
@@ -27,7 +27,7 @@ import tempfile
|
||||
import ursa_major.cli
|
||||
import pytest
|
||||
|
||||
-from mock import patch
|
||||
+from unittest.mock import patch
|
||||
|
||||
|
||||
class TestTagConfigFileCLIOption:
|
||||
--- a/tests/test_remove_module.py
|
||||
+++ b/tests/test_remove_module.py
|
||||
@@ -28,7 +28,7 @@ import six
|
||||
import tempfile
|
||||
import unittest
|
||||
from argparse import Namespace
|
||||
-from mock import patch
|
||||
+from unittest.mock import patch
|
||||
from tests import TEST_DATA_DIR, MockMBSBuildsData, make_mmd, dump_mmd
|
||||
from ursa_major.handlers.remove_module import RemoveModuleHandler
|
||||
|
||||
--- a/tests/test_add_tag_handler.py
|
||||
+++ b/tests/test_add_tag_handler.py
|
||||
@@ -23,7 +23,7 @@
|
||||
# Qixiang Wan <qwan@redhat.com>
|
||||
|
||||
import json
|
||||
-import mock
|
||||
+from unittest import mock
|
||||
import os
|
||||
import shutil
|
||||
import tempfile
|
||||
--- a/tests/test_koji_service.py
|
||||
+++ b/tests/test_koji_service.py
|
||||
@@ -22,7 +22,7 @@
|
||||
# Written by Chenxiong Qi <cqi@redhat.com>
|
||||
# Qixiang Wan <qwan@redhat.com>
|
||||
|
||||
-import mock
|
||||
+from unittest import mock
|
||||
import unittest
|
||||
|
||||
from ursa_major.koji_service import KojiService
|
||||
--- a/tests/test_mbs.py
|
||||
+++ b/tests/test_mbs.py
|
||||
@@ -22,7 +22,7 @@
|
||||
# Written by Chenxiong Qi <cqi@redhat.com>
|
||||
# Qixiang Wan <qwan@redhat.com>
|
||||
|
||||
-import mock
|
||||
+from unittest import mock
|
||||
|
||||
from tests import UrsaMajorTestCase, MockResponse, MockMBSBuildsData
|
||||
from ursa_major.mbs import MBS
|
||||
--- a/tests/test_update_tag.py
|
||||
+++ b/tests/test_update_tag.py
|
||||
@@ -23,7 +23,7 @@
|
||||
# Qixiang Wan <qwan@redhat.com>
|
||||
|
||||
import json
|
||||
-import mock
|
||||
+from unittest import mock
|
||||
import os
|
||||
import six
|
||||
import shutil
|
||||
130
ursa-major.spec
130
ursa-major.spec
|
|
@ -1,23 +1,21 @@
|
|||
%if 0%{?fedora}
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
# we have some koji hubs doesn't support Python3 with kerberos auth
|
||||
# at this moment, so we build with Python2 for all platforms now
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
Name: ursa-major
|
||||
Version: 0.4.1
|
||||
Release: 4%{?dist}
|
||||
Version: 0.5.1
|
||||
Release: 12%{?dist}
|
||||
Summary: A utility for working with module's koji tags in koji's tag inheritance.
|
||||
|
||||
Group: Development/Tools
|
||||
License: MIT
|
||||
URL: https://pagure.io/ursa-major
|
||||
Source0: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{version}.tar.gz
|
||||
Patch0: ursa-major-rm-python-mock-usage.diff
|
||||
|
||||
BuildArch: noarch
|
||||
# libmodulemd is not available for ppc or i686
|
||||
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
|
||||
|
||||
|
||||
BuildRequires: help2man
|
||||
|
||||
|
|
@ -32,7 +30,6 @@ BuildRequires: python3-requests
|
|||
BuildRequires: python3-jinja2
|
||||
BuildRequires: python3-psutil
|
||||
BuildRequires: python3-pytest
|
||||
BuildRequires: python3-mock
|
||||
%else
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-koji
|
||||
|
|
@ -59,14 +56,12 @@ BuildRequires: python2-mock
|
|||
%endif
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} > 7)
|
||||
BuildRequires: libmodulemd1
|
||||
Requires: libmodulemd1
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
BuildRequires: libmodulemd > 1
|
||||
Requires: libmodulemd > 1
|
||||
%else
|
||||
# disable unittest in check phase and build requires of libmodulemd v1
|
||||
# because libmodulemd has been upgraded to v2 in eng-rhel
|
||||
# BuildRequires: libmodulemd
|
||||
Requires: libmodulemd < 2
|
||||
BuildRequires: libmodulemd2
|
||||
Requires: libmodulemd2
|
||||
%endif
|
||||
|
||||
Requires: gobject-introspection
|
||||
|
|
@ -77,7 +72,6 @@ Requires: koji
|
|||
Requires: python3-gobject-base
|
||||
Requires: python3-cairo
|
||||
Requires: python3-koji
|
||||
Requires: python3-m2crypto
|
||||
Requires: python3-six
|
||||
Requires: python3-requests
|
||||
Requires: python3-jinja2
|
||||
|
|
@ -105,7 +99,11 @@ Requires: python2-setuptools
|
|||
%endif
|
||||
|
||||
# Need brewkoji.conf
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
Requires: brewkoji
|
||||
%else
|
||||
Recommends: brewkoji
|
||||
%endif
|
||||
|
||||
|
||||
%description
|
||||
|
|
@ -118,7 +116,11 @@ Summary: A utility for working with module's koji tags in koji's tag inhe
|
|||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
# Need brewkoji-stage.conf
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
Requires: brewkoji-stage
|
||||
%else
|
||||
Recommends: brewkoji-stage
|
||||
%endif
|
||||
|
||||
%description -n ursa-major-stage
|
||||
The ursa-major-stage package contains script and configurations for Ursa-Major
|
||||
|
|
@ -126,7 +128,7 @@ to talk with Fedora's stage instances (Koji, MBS).
|
|||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autosetup -p1
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
# old setuptools not support environment marker
|
||||
|
|
@ -165,11 +167,11 @@ done
|
|||
|
||||
%check
|
||||
# disable unittest due to missing libmodulemd v1 in buildroot
|
||||
# %if 0%{?with_python3}
|
||||
# py.test-3
|
||||
# %else
|
||||
# py.test
|
||||
# %endif
|
||||
%if 0%{?with_python3}
|
||||
py.test-3
|
||||
%else
|
||||
py.test
|
||||
%endif
|
||||
|
||||
|
||||
%files
|
||||
|
|
@ -193,6 +195,92 @@ done
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Thu Jun 04 2026 Python Maint <python-maint@redhat.com> - 0.5.1-11
|
||||
- Rebuilt for Python 3.15
|
||||
|
||||
* Thu May 07 2026 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 0.5.1-10
|
||||
- Drop ExclusiveArch as package is built on all available architectures.
|
||||
|
||||
* Wed Feb 11 2026 Michel Lind <salimma@fedoraproject.org> - 0.5.1-9
|
||||
- Rebuilt without python-mock
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 0.5.1-7
|
||||
- Rebuilt for Python 3.14.0rc3 bytecode
|
||||
|
||||
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 0.5.1-6
|
||||
- Rebuilt for Python 3.14.0rc2 bytecode
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 0.5.1-4
|
||||
- Rebuilt for Python 3.14
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Mon Oct 28 2024 Yu Ming Zhu <yzhu@redhat.com> - 0.5.1-2
|
||||
- remove pyhon3-m2crypto dependency (Yuming Zhu)
|
||||
|
||||
* Tue Jul 09 2024 Yu Ming Zhu <yzhu@redhat.com> - 0.5.1-1
|
||||
- fetch all pages and add buildrequires filter (Yuming Zhu)
|
||||
|
||||
* Mon Mar 25 2024 Yu Ming Zhu <yzhu@redhat.com> - 0.5.0-2
|
||||
- fix unit tests for python2 (Yuming Zhu)
|
||||
|
||||
* Mon Mar 25 2024 Yu Ming Zhu <yzhu@redhat.com> - 0.5.0-1
|
||||
- tags_from restriction (Yuming Zhu)
|
||||
|
||||
* Tue Jun 27 2023 Yu Ming Zhu <yzhu@redhat.com> - 0.4.3-1
|
||||
- Use gssapi_login instead of krb_login for koji kerberos auth (Yuming Zhu)
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 0.4.2-11
|
||||
- Rebuilt for Python 3.13
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 0.4.2-8
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.4.2-5
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.4.2-2
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Thu Mar 11 2021 Yu Ming Zhu <yzhu@redhat.com> - 0.4.2-1
|
||||
- Use old tuple syntax for mock.call.call_args of old mock release (Yuming Zhu)
|
||||
- Fix unittests for missing koji profile (Yuming Zhu)
|
||||
- Using libmodulemd v2 API (Yuming Zhu)
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue