Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-ddt for openSUSE:Factory
checked in at 2022-11-17 17:23:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ddt (Old)
and /work/SRC/openSUSE:Factory/.python-ddt.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ddt"
Thu Nov 17 17:23:30 2022 rev:18 rq:1036272 version:1.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-ddt/python-ddt.changes 2022-09-27
20:13:17.465742381 +0200
+++ /work/SRC/openSUSE:Factory/.python-ddt.new.1597/python-ddt.changes
2022-11-17 17:23:31.232753122 +0100
@@ -1,0 +2,7 @@
+Wed Nov 16 17:20:57 UTC 2022 - Daniel Garcia <daniel.gar...@suse.com>
+
+- Add remove-six.patch to remove six dependency
+- Remove python_module macro definition
+- More specific python_sitelib in %files
+
+-------------------------------------------------------------------
New:
----
remove-six.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ddt.spec ++++++
--- /var/tmp/diff_new_pack.i3LO9S/_old 2022-11-17 17:23:31.812756189 +0100
+++ /var/tmp/diff_new_pack.i3LO9S/_new 2022-11-17 17:23:31.820756232 +0100
@@ -16,7 +16,6 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without python2
Name: python-ddt
Version: 1.6.0
@@ -25,8 +24,9 @@
License: MIT
URL: https://github.com/txels/ddt
Source:
https://files.pythonhosted.org/packages/source/d/ddt/ddt-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM remove-six.patch gh#datadriventests/ddt#110
+Patch0: remove-six.patch
BuildRequires: %{python_module setuptools}
-BuildRequires: %{python_module six}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildArch: noarch
@@ -44,8 +44,7 @@
A library to multiply test cases.
%prep
-%setup -q -n ddt-%{version}
-%autopatch -p1
+%autosetup -p1 -n ddt-%{version}
%build
%python_build
@@ -60,6 +59,8 @@
%files %{python_files}
%doc CONTRIBUTING.md README.md
%license LICENSE.md
-%{python_sitelib}/*
+%{python_sitelib}/ddt.py
+%{python_sitelib}/ddt-%{version}*-info
+%pycache_only %{python_sitelib}/__pycache__
%changelog
++++++ remove-six.patch ++++++
Index: ddt-1.6.0/test/test_functional.py
===================================================================
--- ddt-1.6.0.orig/test/test_functional.py
+++ ddt-1.6.0/test/test_functional.py
@@ -1,8 +1,8 @@
import os
import json
+import sys
from sys import modules
import pytest
-import six
try:
from unittest import mock
@@ -444,35 +444,35 @@ def test_ddt_data_doc_attribute():
assert getattr(getattr(ddt_mytest, 'second_test_3'), '__doc__') is None
-def test_ddt_data_unicode():
+@pytest.mark.skipif(sys.version_info.major > 2, reason='Python2 only test')
+def test_ddt_data_unicode_py2():
"""
Test that unicode strings are converted to function names correctly
"""
- # We test unicode support separately for python 2 and 3
-
- if six.PY2:
+ @ddt
+ class Mytest(object):
+ @data(u'ascii', u'non-ascii-\N{SNOWMAN}', {u'\N{SNOWMAN}': 'data'})
+ def test_hello(self, val):
+ pass
+
+ assert getattr(Mytest, 'test_hello_1_ascii') is not None
+ assert getattr(Mytest, 'test_hello_2_non_ascii__u2603') is not None
+ assert getattr(Mytest, 'test_hello_3') is not None
- @ddt
- class Mytest(object):
- @data(u'ascii', u'non-ascii-\N{SNOWMAN}', {u'\N{SNOWMAN}': 'data'})
- def test_hello(self, val):
- pass
-
- assert getattr(Mytest, 'test_hello_1_ascii') is not None
- assert getattr(Mytest, 'test_hello_2_non_ascii__u2603') is not None
- assert getattr(Mytest, 'test_hello_3') is not None
-
- elif six.PY3:
-
- @ddt
- class Mytest(object):
- @data('ascii', 'non-ascii-\N{SNOWMAN}', {'\N{SNOWMAN}': 'data'})
- def test_hello(self, val):
- pass
-
- assert getattr(Mytest, 'test_hello_1_ascii') is not None
- assert getattr(Mytest, 'test_hello_2_non_ascii__') is not None
- assert getattr(Mytest, 'test_hello_3') is not None
+@pytest.mark.skipif(sys.version_info.major < 3, reason='Python3 only test')
+def test_ddt_data_unicode_py3():
+ """
+ Test that unicode strings are converted to function names correctly
+ """
+ @ddt
+ class Mytest(object):
+ @data('ascii', 'non-ascii-\N{SNOWMAN}', {'\N{SNOWMAN}': 'data'})
+ def test_hello(self, val):
+ pass
+
+ assert getattr(Mytest, 'test_hello_1_ascii') is not None
+ assert getattr(Mytest, 'test_hello_2_non_ascii__') is not None
+ assert getattr(Mytest, 'test_hello_3') is not None
def test_ddt_data_object():
