python/python-odorik
SHA256
15
0
Fork 0
forked from pool/python-odorik
Code Pull Requests Activity

Accepting request 1158766 from devel:languages:python

Browse Source 
- Add assertEquals.patch replacing assertEquals with assertEqual
  (incompatible with Python 3.12).

OBS-URL: https://build.opensuse.org/request/show/1158766
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-odorik?expand=0&rev=10
This commit is contained in:
Ana Guerrero
2024-03-17 21:17:02 +00:00
committed by Git OBS Bridge
parent e2cf84fdb0 07c4c57e1f
commit 8e1812e7a7
3 changed files with 118 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
assertEquals.patch Normal file
View File

@@ -0,0 +1,99 @@
From d90f3a6cd76972a4a059ba33141ba94c61fec5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 4 Jan 2019 13:31:32 +0100
Subject: [PATCH] Avoid using deprecated assertEquals
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Michal Čihař <michal@cihar.com>
---
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(),

6
python-odorik.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 15 17:26:55 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
- Add assertEquals.patch replacing assertEquals with assertEqual
(incompatible with Python 3.12).
-------------------------------------------------------------------
Tue Oct 11 02:16:31 UTC 2022 - Steve Kowalik <steven.kowalik@suse.com>

20
python-odorik.spec
View File

@@ -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,23 @@ 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-OPENSUSE assertEquals.patch mcepl@suse.com
# 3.12 finally removed assertEquals method
# Patch from gh#nijel/odorik#d90f3a6cd76972
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 +47,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 +73,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