- update to 1.4.2:
* Fix test failure with PyYAML 5.4.1 - rm 0001-Use-Yaml-s-UnsafeLoader-for-Python-embedding-tests.patch: merged upstream OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ddt?expand=0&rev=30
This commit is contained in:
parent
670eff0027
commit
1f272cb384
@ -1,62 +0,0 @@
|
|||||||
From 97f0a2315736e50f1b34a015447cd751da66ecb6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dirk Mueller <dirk@dmllr.de>
|
|
||||||
Date: Mon, 25 Jan 2021 22:49:04 +0100
|
|
||||||
Subject: [PATCH] Use Yaml's UnsafeLoader for Python embedding tests
|
|
||||||
|
|
||||||
In newer PyYAML versions the default FullLoader has
|
|
||||||
python/object/* integration removed. One has to use
|
|
||||||
UnsafeLoader instead. see this issue for details:
|
|
||||||
|
|
||||||
https://github.com/yaml/pyyaml/issues/321
|
|
||||||
---
|
|
||||||
test/test_example.py | 2 +-
|
|
||||||
test/test_functional.py | 10 +++++-----
|
|
||||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/test/test_example.py b/test/test_example.py
|
|
||||||
index db2cf17..1d27043 100644
|
|
||||||
--- a/test/test_example.py
|
|
||||||
+++ b/test/test_example.py
|
|
||||||
@@ -151,7 +151,7 @@ if have_yaml_support:
|
|
||||||
|
|
||||||
@ddt
|
|
||||||
class YamlOnlyTestCase(unittest.TestCase):
|
|
||||||
- @file_data('data/test_custom_yaml_loader.yaml', yaml.FullLoader)
|
|
||||||
+ @file_data('data/test_custom_yaml_loader.yaml', yaml.UnsafeLoader)
|
|
||||||
def test_custom_yaml_loader(self, instance, expected):
|
|
||||||
"""Test with yaml tags to create specific classes to compare"""
|
|
||||||
self.assertEqual(expected, instance)
|
|
||||||
diff --git a/test/test_functional.py b/test/test_functional.py
|
|
||||||
index 45c1cae..f9609c6 100644
|
|
||||||
--- a/test/test_functional.py
|
|
||||||
+++ b/test/test_functional.py
|
|
||||||
@@ -440,7 +440,7 @@ def test_load_yaml_with_python_tag():
|
|
||||||
loader allowing python tags is passed.
|
|
||||||
"""
|
|
||||||
|
|
||||||
- from yaml import FullLoader
|
|
||||||
+ from yaml import UnsafeLoader
|
|
||||||
from yaml.constructor import ConstructorError
|
|
||||||
|
|
||||||
def str_to_type(class_name):
|
|
||||||
@@ -457,13 +457,13 @@ def test_load_yaml_with_python_tag():
|
|
||||||
raise AssertionError()
|
|
||||||
|
|
||||||
@ddt
|
|
||||||
- class YamlFullLoaderTest(object):
|
|
||||||
- @file_data('data/test_functional_custom_tags.yaml', FullLoader)
|
|
||||||
+ class YamlUnsafeLoaderTest(object):
|
|
||||||
+ @file_data('data/test_functional_custom_tags.yaml', UnsafeLoader)
|
|
||||||
def test_cls_is_instance(self, instance, expected):
|
|
||||||
assert isinstance(instance, str_to_type(expected))
|
|
||||||
|
|
||||||
- tests = list(filter(_is_test, YamlFullLoaderTest.__dict__))
|
|
||||||
- obj = YamlFullLoaderTest()
|
|
||||||
+ tests = list(filter(_is_test, YamlUnsafeLoaderTest.__dict__))
|
|
||||||
+ obj = YamlUnsafeLoaderTest()
|
|
||||||
|
|
||||||
if not tests:
|
|
||||||
raise AssertionError('No tests have been found.')
|
|
||||||
--
|
|
||||||
2.30.0
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:0595e70d074e5777771a45709e99e9d215552fb1076443a25fad6b23d8bf38da
|
|
||||||
size 11457
|
|
3
ddt-1.4.2.tar.gz
Normal file
3
ddt-1.4.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:64a67366a2715e636b88694cc6075cc02db292f01098b8e385397c894d395378
|
||||||
|
size 11467
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 23 21:06:40 UTC 2021 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
- update to 1.4.2:
|
||||||
|
* Fix test failure with PyYAML 5.4.1
|
||||||
|
- rm 0001-Use-Yaml-s-UnsafeLoader-for-Python-embedding-tests.patch:
|
||||||
|
merged upstream
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jan 25 21:52:46 UTC 2021 - Dirk Müller <dmueller@suse.com>
|
Mon Jan 25 21:52:46 UTC 2021 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
@ -19,14 +19,12 @@
|
|||||||
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
||||||
%bcond_without python2
|
%bcond_without python2
|
||||||
Name: python-ddt
|
Name: python-ddt
|
||||||
Version: 1.4.1
|
Version: 1.4.2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Data-Driven/Decorated Tests
|
Summary: Data-Driven/Decorated Tests
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://github.com/txels/ddt
|
URL: https://github.com/txels/ddt
|
||||||
Source: https://files.pythonhosted.org/packages/source/d/ddt/ddt-%{version}.tar.gz
|
Source: https://files.pythonhosted.org/packages/source/d/ddt/ddt-%{version}.tar.gz
|
||||||
# https://github.com/datadriventests/ddt/pull/96
|
|
||||||
Patch1: 0001-Use-Yaml-s-UnsafeLoader-for-Python-embedding-tests.patch
|
|
||||||
BuildRequires: %{python_module setuptools}
|
BuildRequires: %{python_module setuptools}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
|
Loading…
Reference in New Issue
Block a user