Compare commits
10 Commits
301f42eac9
...
92afe6c9c2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
92afe6c9c2 | ||
|
|
8027fb7ad5 | ||
|
|
5f2d6c6b7e | ||
|
|
58763a3df8 | ||
|
|
ae3ed21a95 | ||
|
|
3810d22a64 | ||
|
|
ba710589dd | ||
|
|
0a5bb80097 | ||
|
|
3bbaac91ca | ||
|
|
aa3e60e573 |
26
Modify-late_version-return-to-str.patch
Normal file
26
Modify-late_version-return-to-str.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From de3ec76aba458b2b2ba58d1707dc9ecc82387eab Mon Sep 17 00:00:00 2001
|
||||
From: yangchenguang <yangchenguang@kylinsec.com.cn>
|
||||
Date: Thu, 14 Mar 2024 17:46:00 +0800
|
||||
Subject: [PATCH] Modify late_version return to str
|
||||
|
||||
Signed-off-by: yangchenguang <yangchenguang@kylinsec.com.cn>
|
||||
---
|
||||
setup.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 416afbe..fbaafa7 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -18,7 +18,7 @@ class late_version:
|
||||
return str(self) + other
|
||||
def replace(self, old, new):
|
||||
return str(self).replace(old, new)
|
||||
-VERSION = late_version()
|
||||
+VERSION = str(late_version())
|
||||
|
||||
NAME = 'unittest2'
|
||||
|
||||
--
|
||||
2.39.1
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
diff -Nur a/unittest2/compatibility.py b/unittest2/compatibility.py
|
||||
--- a/unittest2/compatibility.py 2014-10-29 18:51:58.000000000 +0800
|
||||
+++ b/unittest2/compatibility.py 2022-03-31 11:21:09.580805329 +0800
|
||||
@@ -1,4 +1,10 @@
|
||||
import collections
|
||||
+try:
|
||||
+ from collections import abc
|
||||
+ collections.MutableMapping = abc.MutableMapping
|
||||
+except:
|
||||
+ pass
|
||||
+
|
||||
import os
|
||||
import sys
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: python-unittest2
|
||||
Version: 1.1.0
|
||||
Release: 16
|
||||
Release: 19
|
||||
Summary: New features added to the unittest testing framework in Python 2.7 and onwards
|
||||
License: BSD
|
||||
URL: http://pypi.python.org/pypi/unittest2
|
||||
@ -8,6 +8,8 @@ Source0: https://pypi.python.org/packages/source/u/unittest2/unittest2-%{
|
||||
|
||||
Patch0000: unittest2-1.1.0-remove-argparse-from-requires.patch
|
||||
Patch0001: unittest2-1.1.0-backport-tests-from-py3.5.patch
|
||||
Patch0002: fix-collections.MutableMapping-no-support-for-python-3.10.patch
|
||||
Patch0003: Modify-late_version-return-to-str.patch
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@ -15,17 +17,6 @@ unittest2 is a backport of the new features added to
|
||||
the unittest testing framework in Python 2.7 and onwards.
|
||||
It is tested to run on Python 2.6, 2.7, 3.2, 3.3, 3.4 and pypy.
|
||||
|
||||
%package -n python2-unittest2
|
||||
Summary: New features added to the unittest testing framework in Python 2.7 and onwards
|
||||
%{?python_provide:%python_provide python2-unittest2}
|
||||
BuildRequires: python2-devel python2-setuptools python2-six python2-traceback2
|
||||
Requires: python2-traceback2 python2-setuptools python2-six
|
||||
|
||||
%description -n python2-unittest2
|
||||
unittest2 is a backport of the new features added to
|
||||
the unittest testing framework in Python 2.7 and onwards.
|
||||
It is tested to run on Python 2.6, 2.7, 3.2, 3.3, 3.4 and pypy.
|
||||
|
||||
%package -n python3-unittest2
|
||||
Summary: New features added to the unittest testing framework in Python 2.7 and onwards
|
||||
%{?python_provide:%python_provide python3-unittest2}
|
||||
@ -42,7 +33,6 @@ It is tested to run on Python 2.6, 2.7, 3.2, 3.3, 3.4 and pypy.
|
||||
rm -rf unittest2.egg-info
|
||||
|
||||
%build
|
||||
%py2_build
|
||||
%py3_build
|
||||
|
||||
%install
|
||||
@ -53,22 +43,9 @@ ln -s unit2-%{python3_version} unit2-3
|
||||
ln -s unit2-%{python3_version} python3-unit2
|
||||
cd -
|
||||
|
||||
%py2_install
|
||||
cd %{buildroot}%{_bindir}
|
||||
mv unit2 unit2-%{python2_version}
|
||||
ln -s unit2-%{python2_version} unit2-2
|
||||
ln -s unit2-2 unit2
|
||||
cd -
|
||||
|
||||
%check
|
||||
%{__python2} -m unittest2
|
||||
%{__python3} -m unittest2
|
||||
|
||||
%files -n python2-unittest2
|
||||
%doc README.txt
|
||||
%{_bindir}/unit2*
|
||||
%{python2_sitelib}/unittest2*
|
||||
|
||||
%files -n python3-unittest2
|
||||
%doc README.txt
|
||||
%{_bindir}/unit2-*
|
||||
@ -76,5 +53,14 @@ cd -
|
||||
%{python3_sitelib}/unittest2*
|
||||
|
||||
%changelog
|
||||
* Thu Mar 14 2024 yangchenguang <yangchenguang@kylinsec.com.cn> - 1.1.0-19
|
||||
- fix build error : modify late_version return to str
|
||||
|
||||
* Tue Mar 22 2022 wulei <wulei80@huawei.com> - 1.1.0-18
|
||||
- Fix collections.MutableMapping no support for python 3.10
|
||||
|
||||
* Fri Sep 11 2020 zhangjiapeng <zhangjiapeng9@huawei.com> - 1.1.0-17
|
||||
- Remove python2-unittest2 subpackage
|
||||
|
||||
* Wed Nov 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.1.0-16
|
||||
- Package init
|
||||
|
||||
4
python-unittest2.yaml
Normal file
4
python-unittest2.yaml
Normal file
@ -0,0 +1,4 @@
|
||||
version_control: pypi
|
||||
src_repo: unittest2
|
||||
tag_prefix: ^v
|
||||
seperator: .
|
||||
Loading…
x
Reference in New Issue
Block a user