From b0b60a46e14e1154c88dc6a46eac9e9d8133dff3083e6bf97829544efa534593 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sun, 17 Mar 2024 09:03:57 +0000 Subject: [PATCH] - Add assertEquals.patch replacing assertEquals with assertEqual (incompatible with Python 3.12). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-odorik?expand=0&rev=19 --- assertEquals.patch | 90 +++++++++++++++++++++++++++++++++++++++++++ python-odorik.changes | 6 +++ python-odorik.spec | 19 +++++---- 3 files changed, 108 insertions(+), 7 deletions(-) create mode 100644 assertEquals.patch diff --git a/assertEquals.patch b/assertEquals.patch new file mode 100644 index 0000000..62a4631 --- /dev/null +++ b/assertEquals.patch @@ -0,0 +1,90 @@ +--- + odorik/test_main.py | 4 ++-- + odorik/test_odorik.py | 14 +++++++------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +--- a/odorik/test_main.py ++++ b/odorik/test_main.py +@@ -392,7 +392,7 @@ class TestCommands(TestCase): + '00420789123456', + 'text' + ]) +- self.assertEquals('', output) ++ self.assertEqual('', output) + + @httpretty.activate + def test_send_sms_invalid(self): +@@ -411,7 +411,7 @@ class TestCommands(TestCase): + output = execute([ + 'callback', '00420789123456', '800123456' + ]) +- self.assertEquals('', output) ++ self.assertEqual('', output) + + @httpretty.activate + def test_summary(self): +--- a/odorik/test_odorik.py ++++ b/odorik/test_odorik.py +@@ -206,7 +206,7 @@ class OdorikTest(TestCase): + def test_sms_send(self): + """Test sending SMS.""" + register_uris() +- self.assertEquals( ++ self.assertEqual( + Odorik().send_sms( + '00420789123456', + 'text' +@@ -230,7 +230,7 @@ class OdorikTest(TestCase): + def test_callback(self): + """Test callback.""" + register_uris() +- self.assertEquals( ++ self.assertEqual( + Odorik().callback( + '00420789123456', + '800123456' +@@ -242,7 +242,7 @@ class OdorikTest(TestCase): + def test_callback_line(self): + """Test callback.""" + register_uris() +- self.assertEquals( ++ self.assertEqual( + Odorik().callback( + '00420789123456', + '800123456', +@@ -255,7 +255,7 @@ class OdorikTest(TestCase): + def test_calls(self): + """Test calls.""" + register_uris() +- self.assertEquals( ++ self.assertEqual( + len(Odorik().calls( + datetime.datetime.now(), + datetime.datetime.now(), +@@ -267,7 +267,7 @@ class OdorikTest(TestCase): + def test_calls_line(self): + """Test calls.""" + register_uris() +- self.assertEquals( ++ self.assertEqual( + len(Odorik().calls( + datetime.datetime.now(), + datetime.datetime.now(), +@@ -280,7 +280,7 @@ class OdorikTest(TestCase): + def test_sms(self): + """Test sms.""" + register_uris() +- self.assertEquals( ++ self.assertEqual( + len(Odorik().sms( + datetime.datetime.now(), + datetime.datetime.now(), +@@ -292,7 +292,7 @@ class OdorikTest(TestCase): + def test_sms_line(self): + """Test sms.""" + register_uris() +- self.assertEquals( ++ self.assertEqual( + len(Odorik().sms( + datetime.datetime.now(), + datetime.datetime.now(), diff --git a/python-odorik.changes b/python-odorik.changes index 6b0ae0f..14986a8 100644 --- a/python-odorik.changes +++ b/python-odorik.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 15 17:26:55 UTC 2024 - Matej Cepl + +- Add assertEquals.patch replacing assertEquals with assertEqual + (incompatible with Python 3.12). + ------------------------------------------------------------------- Tue Oct 11 02:16:31 UTC 2022 - Steve Kowalik diff --git a/python-odorik.spec b/python-odorik.spec index f5357d1..3fe4aad 100644 --- a/python-odorik.spec +++ b/python-odorik.spec @@ -1,7 +1,7 @@ # # spec file for package python-odorik # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,6 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-odorik Version: 0.5 Release: 0 @@ -24,17 +23,22 @@ Summary: Python module for Odorik API License: GPL-3.0-or-later URL: https://cihar.com/software/odorik/ Source: https://files.pythonhosted.org/packages/source/o/odorik/odorik-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM assertEquals.patch bsc#[0-9]+ mcepl@suse.com +# 3.12 finally removed assertEquals method +Patch0: assertEquals.patch BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module httpretty} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module python-dateutil} BuildRequires: %{python_module pyxdg} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-python-dateutil Requires: python-xdg Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives BuildArch: noarch %python_subpackages @@ -42,14 +46,14 @@ BuildArch: noarch Python module to work with Odorik API. %prep -%setup -q -n odorik-%{version} +%autosetup -p1 -n odorik-%{version} %build -%python_build +%pyproject_wheel %make_build -C docs man %install -%python_install +%pyproject_install install -d %{buildroot}%{_mandir}/man1 install -m 644 docs/_build/man/odorik.1 %{buildroot}%{_mandir}/man1 %python_clone -a %{buildroot}%{_bindir}/odorik @@ -68,8 +72,9 @@ install -m 644 docs/_build/man/odorik.1 %{buildroot}%{_mandir}/man1 %files %{python_files} %license LICENSE %doc NEWS.rst README.rst -%{python_sitelib}/* %python_alternative %{_mandir}/man1/odorik.1%{ext_man} %python_alternative %{_bindir}/odorik +%{python_sitelib}/odorik +%{python_sitelib}/odorik-%{version}*-info %changelog