Build release 0.2.2

Signed-off-by: Chenxiong Qi <cqi@redhat.com>
Build release 0.2.1
2019-03-26 21:14:30 +08:00 · 2019-03-26 18:19:42 +08:00
4 changed files with 22 additions and 256 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,9 +2,3 @@
 /ursa-major-0.2.0.tar.gz
 /ursa-major-0.2.1.tar.gz
 /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
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (ursa-major-0.5.1.tar.gz) = b738436e34301f7e7e7ee29bf2969826875f7ec9256e797e53e049f1092efeeb055f39e929c2d6cf9b99b4634b6e4eaa7ae3087f54b623d28f23f0f1b2907ea0
+SHA512 (ursa-major-0.2.2.tar.gz) = 942b62ad3006ee2417f7dfde2ff781e06b0916a07e63e01da7fdd3c37c2994673f3b40dbf43adb0ce60710e7190658ed77770e7cca30d50307e41cd20d477acb
--- a/ursa-major-rm-python-mock-usage.diff
+++ b/ursa-major-rm-python-mock-usage.diff
@ -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 <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
--- a/ursa-major.spec
+++ b/ursa-major.spec
@ -1,21 +1,25 @@
-%if 0%{?fedora} || 0%{?rhel} > 7
+%if 0%{?fedora}
 # 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
+%global with_python3 0
 %endif

 Name:       ursa-major
-Version:    0.5.1
-Release:    12%{?dist}
+Version:    0.2.2
+Release:    1%{?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
+# EPEL:   libmodulemd is not available for ppc or i686
+# Fedora: include ix86 as build can be scheduled to i386 arch, otherwise there is
+# 	  error: Architecture is not included: i386
+ExclusiveArch:  %{ix86} x86_64 noarch
+

 BuildRequires:  help2man

@ -30,6 +34,7 @@ BuildRequires:  python3-requests
 BuildRequires:  python3-jinja2
 BuildRequires:  python3-psutil
 BuildRequires:  python3-pytest
+BuildRequires:  python3-mock
 %else
 BuildRequires:  python2-devel
 BuildRequires:  python2-koji
@ -56,17 +61,18 @@ BuildRequires:  python2-mock
 %endif
 %endif

-%if 0%{?fedora} || 0%{?rhel} > 7
-BuildRequires:  libmodulemd > 1
-Requires:  libmodulemd > 1
+%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} > 7)
+BuildRequires:  libmodulemd1
+Requires:  libmodulemd1
 %else
-BuildRequires:  libmodulemd2
-Requires:  libmodulemd2
+BuildRequires:  libmodulemd
+Requires:  libmodulemd
 %endif

 Requires:       gobject-introspection
 Requires:       krb5-workstation
 Requires:       koji
+Requires:       m2crypto

 %if 0%{?with_python3}
 Requires:       python3-gobject-base
@ -75,10 +81,8 @@ Requires:       python3-koji
 Requires:       python3-six
 Requires:       python3-requests
 Requires:       python3-jinja2
-Requires:       python3-setuptools
 %else
 Requires:       python2-koji
-Requires:       m2crypto
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:       python-gobject-base
 Requires:       pycairo
@ -86,7 +90,6 @@ Requires:       python-six
 Requires:       python-requests
 Requires:       python-jinja2
 Requires:       python-futures
-Requires:       python-setuptools
 %else
 Requires:       python2-gobject-base
 Requires:       python2-cairo
@ -94,17 +97,9 @@ Requires:       python2-six
 Requires:       python2-requests
 Requires:       python2-jinja2
 Requires:       python2-futures
-Requires:       python2-setuptools
 %endif
 %endif

-# Need brewkoji.conf
-%if 0%{?rhel} && 0%{?rhel} <= 7
-Requires:       brewkoji
-%else
-Recommends:     brewkoji
-%endif
-

 %description
 Usra-Major can be used to edit a tag config file and update module's koji tags
@ -115,22 +110,17 @@ in koji's tag inheritance accordingly per the configuration in tag config file.
 Summary:        A utility for working with module's koji tags in koji's tag inheritance.
 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
 to talk with Fedora's stage instances (Koji, MBS).


 %prep
-%autosetup -p1
+%setup -q

 %if 0%{?rhel} && 0%{?rhel} <= 7
+# workaround for no egg-info
+sed -i '/pycairo/d' requirements.txt
 # old setuptools not support environment marker
 sed -i 's/futures.*/futures/' requirements.txt
 %endif
@ -165,8 +155,8 @@ for cmd in show-config check-config remove-module add-module add-tag; do
    help2man -N --no-discard-stderr --version-string=%{version} "%{buildroot}/%{_bindir}/ursa-major $cmd" > %{buildroot}/%{_mandir}/man1/ursa-major-${cmd}.1
 done

+
 %check
-# disable unittest due to missing libmodulemd v1 in buildroot
 %if 0%{?with_python3}
 py.test-3
 %else
@ -195,128 +185,7 @@ py.test


 %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
-
-* Sat May 30 2020 Yu Ming Zhu <yzhu@redhat.com> - 0.4.1-3
- Requires python3-m2crypto for python3
- Recommends brew[-stage] instead of Requires
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.4.1-2
- Rebuilt for Python 3.9
-
-* Tue Feb 11 2020 Qixiang Wan <qwan@redhat.com> - 0.4.1-1
- Remove updating koji inheritance ability from add-module and remove-module
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Sep 24 2019 Miro Hrončok <mhroncok@redhat.com> - 0.3.1-4
- Require correct version of m2crypto
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.3.1-3
- Rebuilt for Python 3.8
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue May 21 2019 Qixiang Wan <qwan@redhat.com> - 0.3.1-1
- Not check requires/buildrequires for existing koji tags (Qixiang Wan)
- Updating existing inheritance instead of removing and adding (Qixiang Wan)
-
-* Mon Apr 15 2019 Chenxiong Qi <cqi@redhat.com> - 0.2.2-3
- Build Python 3 package for Fedora and Python 2 for EL
-
-* Fri Apr 12 2019 Chenxiong Qi <cqi@redhat.com> - 0.2.2-2
- Add missing python-setuptools in requires
-
-* Wed Mar 27 2019 Chenxiong Qi <cqi@redhat.com> - 0.2.2-1
+* Tue Mar 26 2019 Chenxiong Qi <cqi@redhat.com> - 0.2.2-1
 - For adding tag, allow filtering on buildrequires to find out koji_tags from tag inheritance (Chenxiong Qi)

 * Wed Mar 20 2019 Chenxiong Qi <cqi@redhat.com> - 0.2.1-1
Author	SHA1	Message	Date
Chenxiong Qi	b71c0a204c	Build release 0.2.2 Signed-off-by: Chenxiong Qi <cqi@redhat.com>	2019-03-26 21:14:30 +08:00
Chenxiong Qi	1b88e978c5	Build release 0.2.1	2019-03-26 18:19:42 +08:00