!9 升级master工程的python-sure到2.0.0版本
From: @xigaoxinyan Reviewed-by: @ruebb Signed-off-by: @ruebb
This commit is contained in:
commit
07546b39bd
@ -1,65 +0,0 @@
|
|||||||
From 9f0e834b2e5eea5dfe21d5be4ea6a3df47baf0b9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Timo Furrer <timo.furrer@roche.com>
|
|
||||||
Date: Wed, 20 Feb 2019 13:26:46 +0100
|
|
||||||
Subject: [PATCH] Import ABCs from collections.abc. Closes #150
|
|
||||||
|
|
||||||
---
|
|
||||||
.travis.yml | 10 +++++++---
|
|
||||||
sure/compat.py | 5 +++++
|
|
||||||
sure/old.py | 5 +----
|
|
||||||
tests/test_assertion_builder.py | 2 +-
|
|
||||||
4 files changed, 14 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/sure/compat.py b/sure/compat.py
|
|
||||||
index df8d323..c53ab28 100644
|
|
||||||
--- a/sure/compat.py
|
|
||||||
+++ b/sure/compat.py
|
|
||||||
@@ -5,6 +5,11 @@
|
|
||||||
import six
|
|
||||||
from collections import OrderedDict
|
|
||||||
|
|
||||||
+try:
|
|
||||||
+ from collections.abc import Iterable
|
|
||||||
+except ImportError:
|
|
||||||
+ from collections import Iterable
|
|
||||||
+
|
|
||||||
from sure.terminal import red, green, yellow
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/sure/old.py b/sure/old.py
|
|
||||||
index e861b26..53e4ee4 100644
|
|
||||||
--- a/sure/old.py
|
|
||||||
+++ b/sure/old.py
|
|
||||||
@@ -22,10 +22,6 @@
|
|
||||||
from copy import deepcopy
|
|
||||||
from pprint import pformat
|
|
||||||
from functools import wraps
|
|
||||||
-try:
|
|
||||||
- from collections import Iterable
|
|
||||||
-except ImportError:
|
|
||||||
- Iterable = (list, dict, tuple, set)
|
|
||||||
|
|
||||||
try:
|
|
||||||
import __builtin__ as builtins
|
|
||||||
@@ -43,6 +39,7 @@
|
|
||||||
from sure.core import _get_file_name
|
|
||||||
from sure.core import _get_line_number
|
|
||||||
from sure.core import itemize_length
|
|
||||||
+from sure.compat import Iterable
|
|
||||||
|
|
||||||
|
|
||||||
def identify_callable_location(callable_object):
|
|
||||||
diff --git a/tests/test_assertion_builder.py b/tests/test_assertion_builder.py
|
|
||||||
index 4dc00fc..c043648 100644
|
|
||||||
--- a/tests/test_assertion_builder.py
|
|
||||||
+++ b/tests/test_assertion_builder.py
|
|
||||||
@@ -137,7 +137,7 @@ def test_should_be_a():
|
|
||||||
("this(None).should.be.none")
|
|
||||||
|
|
||||||
assert this(1).should.be.an(int)
|
|
||||||
- assert this([]).should.be.a('collections.Iterable')
|
|
||||||
+ assert this([]).should.be.a('sure.compat.Iterable')
|
|
||||||
assert this({}).should_not.be.a(list)
|
|
||||||
|
|
||||||
def opposite():
|
|
||||||
@ -1,16 +1,15 @@
|
|||||||
Name: python-sure
|
Name: python-sure
|
||||||
Version: 1.4.11
|
Version: 2.0.0
|
||||||
Release: 7
|
Release: 1
|
||||||
Summary: Utility belt for automated testing in Python
|
Summary: Utility belt for automated testing in Python
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: https://github.com/gabrielfalcao/sure
|
URL: https://github.com/gabrielfalcao/sure
|
||||||
Source0: https://files.pythonhosted.org/packages/source/s/sure/sure-%{version}.tar.gz
|
Source0: https://files.pythonhosted.org/packages/source/s/sure/sure-%{version}.tar.gz
|
||||||
# https://github.com/gabrielfalcao/sure/commit/9f0e834
|
# https://github.com/gabrielfalcao/sure/commit/9f0e834
|
||||||
Patch0: fix-import-collections-error.patch
|
|
||||||
# https://src.fedoraproject.org/rpms/python-sure/pull-request/1
|
# https://src.fedoraproject.org/rpms/python-sure/pull-request/1
|
||||||
Patch1: python3.10-workaround.patch
|
Patch0: python3.10-workaround.patch
|
||||||
|
|
||||||
BuildRequires: python3-devel python3-mock python3-nose python3-setuptools python3-six
|
BuildRequires: python3-devel python3-mock python3-setuptools python3-six python3-pytest python-pytest-cov
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -28,6 +27,7 @@ inspired in RSpec Expectations and should.js.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n sure-%{version} -p1
|
%autosetup -n sure-%{version} -p1
|
||||||
|
cp -r sure/ tests/
|
||||||
rm -rf sure.egg-info
|
rm -rf sure.egg-info
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -37,13 +37,17 @@ rm -rf sure.egg-info
|
|||||||
%py3_install
|
%py3_install
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%{__python3} -m nose --verbosity 2
|
/usr/bin/pytest --ignore=tests/test_old_api.py
|
||||||
|
|
||||||
%files -n python3-sure
|
%files -n python3-sure
|
||||||
%doc COPYING
|
%doc COPYING
|
||||||
|
%{_bindir}/sure
|
||||||
%{python3_sitelib}/*
|
%{python3_sitelib}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Apr 29 2022 xigaoxinyan <xigaoxinyan@h-partners.com> - 2.0.0-1
|
||||||
|
- upgrad 2.0.0
|
||||||
|
|
||||||
* Fri Apr 01 2022 wangkai <wangkai385@huawei.com> - 1.4.11-7
|
* Fri Apr 01 2022 wangkai <wangkai385@huawei.com> - 1.4.11-7
|
||||||
- Fix compilation failures
|
- Fix compilation failures
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
BIN
sure-2.0.0.tar.gz
Normal file
BIN
sure-2.0.0.tar.gz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user