diff --git a/.gitignore b/.gitignore index 71a6192..46b556d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,3 @@ /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 diff --git a/sources b/sources index dcfe7dc..68b4ca9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ursa-major-0.5.1.tar.gz) = b738436e34301f7e7e7ee29bf2969826875f7ec9256e797e53e049f1092efeeb055f39e929c2d6cf9b99b4634b6e4eaa7ae3087f54b623d28f23f0f1b2907ea0 +SHA512 (ursa-major-0.4.2.tar.gz) = 4758d0368af6b48063116fcbe59c6f22ab9ed0abf573e91bc8e4b2d0b1aee9b230986d659dc2559d3338e3633414e599b6f8bf8d1b1c6e74fb5d953870a5fb2a diff --git a/ursa-major-rm-python-mock-usage.diff b/ursa-major-rm-python-mock-usage.diff deleted file mode 100644 index f0c27de..0000000 --- a/ursa-major-rm-python-mock-usage.diff +++ /dev/null @@ -1,97 +0,0 @@ ---- 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 - - 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 - # Qixiang Wan - --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 - # Qixiang Wan - --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 - - import json --import mock -+from unittest import mock - import os - import six - import shutil diff --git a/ursa-major.spec b/ursa-major.spec index 38398f6..c02fad7 100644 --- a/ursa-major.spec +++ b/ursa-major.spec @@ -5,17 +5,19 @@ %endif Name: ursa-major -Version: 0.5.1 -Release: 12%{?dist} +Version: 0.4.2 +Release: 6%{?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 @@ -30,6 +32,7 @@ BuildRequires: python3-requests BuildRequires: python3-jinja2 BuildRequires: python3-psutil BuildRequires: python3-pytest +BuildRequires: python3-mock %else BuildRequires: python2-devel BuildRequires: python2-koji @@ -72,6 +75,7 @@ Requires: koji Requires: python3-gobject-base Requires: python3-cairo Requires: python3-koji +Requires: python3-m2crypto Requires: python3-six Requires: python3-requests Requires: python3-jinja2 @@ -128,7 +132,7 @@ to talk with Fedora's stage instances (Koji, MBS). %prep -%autosetup -p1 +%setup -q %if 0%{?rhel} && 0%{?rhel} <= 7 # old setuptools not support environment marker @@ -195,69 +199,6 @@ py.test %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 0.5.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Thu Jun 04 2026 Python Maint - 0.5.1-11 -- Rebuilt for Python 3.15 - -* Thu May 07 2026 Marcin Juszkiewicz - 0.5.1-10 -- Drop ExclusiveArch as package is built on all available architectures. - -* Wed Feb 11 2026 Michel Lind - 0.5.1-9 -- Rebuilt without python-mock - -* Sat Jan 17 2026 Fedora Release Engineering - 0.5.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Sep 19 2025 Python Maint - 0.5.1-7 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 0.5.1-6 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Fri Jul 25 2025 Fedora Release Engineering - 0.5.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jun 03 2025 Python Maint - 0.5.1-4 -- Rebuilt for Python 3.14 - -* Sun Jan 19 2025 Fedora Release Engineering - 0.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Oct 28 2024 Yu Ming Zhu - 0.5.1-2 -- remove pyhon3-m2crypto dependency (Yuming Zhu) - -* Tue Jul 09 2024 Yu Ming Zhu - 0.5.1-1 -- fetch all pages and add buildrequires filter (Yuming Zhu) - -* Mon Mar 25 2024 Yu Ming Zhu - 0.5.0-2 -- fix unit tests for python2 (Yuming Zhu) - -* Mon Mar 25 2024 Yu Ming Zhu - 0.5.0-1 -- tags_from restriction (Yuming Zhu) - -* Tue Jun 27 2023 Yu Ming Zhu - 0.4.3-1 -- Use gssapi_login instead of krb_login for koji kerberos auth (Yuming Zhu) - -* Sat Jul 20 2024 Fedora Release Engineering - 0.4.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 0.4.2-11 -- Rebuilt for Python 3.13 - -* Sat Jan 27 2024 Fedora Release Engineering - 0.4.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 0.4.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jun 15 2023 Python Maint - 0.4.2-8 -- Rebuilt for Python 3.12 - -* Sat Jan 21 2023 Fedora Release Engineering - 0.4.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Sat Jul 23 2022 Fedora Release Engineering - 0.4.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild