From 40e4fdadc80fc14d5ad775aac441711afa3cd50e9327cb447b4593743ec121c4 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Mon, 20 Sep 2021 02:10:19 +0000 Subject: [PATCH] - Add switch-to-pytest.patch * Use assert and pytest rather than nose. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyRFC3339?expand=0&rev=9 --- python-pyRFC3339.changes | 6 ++ python-pyRFC3339.spec | 3 +- switch-to-pytest.patch | 126 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 switch-to-pytest.patch diff --git a/python-pyRFC3339.changes b/python-pyRFC3339.changes index 246cf71..6caea4c 100644 --- a/python-pyRFC3339.changes +++ b/python-pyRFC3339.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 20 02:09:22 UTC 2021 - Steve Kowalik + +- Add switch-to-pytest.patch + * Use assert and pytest rather than nose. + ------------------------------------------------------------------- Thu Jun 3 11:27:14 UTC 2021 - pgajdos@suse.com diff --git a/python-pyRFC3339.spec b/python-pyRFC3339.spec index f2cbd44..335dd01 100644 --- a/python-pyRFC3339.spec +++ b/python-pyRFC3339.spec @@ -25,7 +25,7 @@ License: MIT Group: Development/Languages/Python URL: https://github.com/kurtraschke/pyRFC3339 Source: https://github.com/kurtraschke/pyRFC3339/archive/refs/tags/v1.1.tar.gz#/pyRFC3339-%{version}.tar.gz -BuildRequires: %{python_module nose} +Patch0: switch-to-pytest.patch BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytz} BuildRequires: %{python_module setuptools} @@ -40,6 +40,7 @@ pyRFC3339 parses and generates :RFC:`3339`-compliant timestamps using Python `da %prep %setup -q -n pyRFC3339-%{version} +%autopatch -p1 %build %python_build diff --git a/switch-to-pytest.patch b/switch-to-pytest.patch new file mode 100644 index 0000000..bd37db3 --- /dev/null +++ b/switch-to-pytest.patch @@ -0,0 +1,126 @@ +Index: pyRFC3339-1.1/pyrfc3339/tests/tests.py +=================================================================== +--- pyRFC3339-1.1.orig/pyrfc3339/tests/tests.py ++++ pyRFC3339-1.1/pyrfc3339/tests/tests.py +@@ -10,7 +10,7 @@ from pyrfc3339 import generate, parse + from pyrfc3339.utils import timezone + import pytz + +-from nose.tools import eq_, raises ++from pytest import raises + + + class TestCore(): +@@ -24,8 +24,8 @@ class TestCore(): + Test rounding of timezone values to the nearest second. + + ''' +- eq_(timezone(5429), '+01:30') +- eq_(timezone(5431), '+01:31') ++ assert timezone(5429) == '+01:30' ++ assert timezone(5431) == '+01:31' + + def test_zero_offset(self): + ''' +@@ -34,11 +34,11 @@ class TestCore(): + ''' + timestamp = '2009-01-01T10:02:03+00:00' + dt = parse(timestamp) +- eq_(dt.tzinfo, pytz.utc) ++ assert dt.tzinfo == pytz.utc + + timestamp = '2009-01-01T10:02:03-00:00' + dt = parse(timestamp) +- eq_(dt.tzinfo, pytz.utc) ++ assert dt.tzinfo == pytz.utc + + def test_deepcopy(self): + ''' +@@ -56,7 +56,7 @@ class TestCore(): + ''' + timestamp = '2009-01-01T10:02:03.25Z' + dt = parse(timestamp) +- eq_(dt.microsecond, 250000) ++ assert dt.microsecond == 250000 + + def test_generate_microseconds(self): + ''' +@@ -65,7 +65,7 @@ class TestCore(): + ''' + dt = datetime(2009, 1, 1, 10, 2, 3, 500000, pytz.utc) + timestamp = generate(dt, microseconds=True) +- eq_(timestamp, '2009-01-01T10:02:03.500000Z') ++ assert timestamp == '2009-01-01T10:02:03.500000Z' + + def test_mixed_case(self): + ''' +@@ -76,7 +76,7 @@ class TestCore(): + dt1 = parse('2009-01-01t10:01:02z') + dt2 = datetime(2009, 1, 1, 10, 1, 2, tzinfo=pytz.utc) + +- eq_(dt1, dt2) ++ assert dt1 == dt2 + + def test_parse_naive_utc(self): + ''' +@@ -84,15 +84,15 @@ class TestCore(): + + ''' + dt1 = parse('2009-01-01T10:01:02Z', produce_naive=True) +- eq_(dt1.tzinfo, None) ++ assert dt1.tzinfo is None + +- @raises(ValueError) + def test_parse_naive_local(self): + ''' + Test that parsing a local timestamp to a naive datetime fails. + + ''' +- parse('2009-01-01T10:01:02-04:00', produce_naive=True) ++ with raises(ValueError): ++ parse('2009-01-01T10:01:02-04:00', produce_naive=True) + + def test_generate_utc_parse_utc(self): + ''' +@@ -103,7 +103,7 @@ class TestCore(): + dt1 = dt1.replace(tzinfo=pytz.utc) + + dt2 = parse(generate(dt1, microseconds=True)) +- eq_(dt1, dt2) ++ assert dt1 == dt2 + + def test_generate_local_parse_local(self): + ''' +@@ -113,7 +113,7 @@ class TestCore(): + eastern = pytz.timezone('US/Eastern') + dt1 = eastern.localize(datetime.utcnow()) + dt2 = parse(generate(dt1, utc=False, microseconds=True), utc=False) +- eq_(dt1, dt2) ++ assert dt1 == dt2 + + def test_generate_local_parse_utc(self): + ''' +@@ -123,7 +123,7 @@ class TestCore(): + eastern = pytz.timezone('US/Eastern') + dt1 = eastern.localize(datetime.utcnow()) + dt2 = parse(generate(dt1, utc=False, microseconds=True)) +- eq_(dt1, dt2) ++ assert dt1 == dt2 + + + class TestExhaustiveRoundtrip(): +@@ -150,7 +150,7 @@ class TestExhaustiveRoundtrip(): + dt1 = tzinfo.localize(datetime.utcnow()) + timestamp = generate(dt1, utc=False, microseconds=True) + dt2 = parse(timestamp, utc=False) +- eq_(dt1, dt2) ++ assert dt1 == dt2 + + def test_utc_roundtrip(self): + for tz_name in pytz.all_timezones: +@@ -167,4 +167,4 @@ class TestExhaustiveRoundtrip(): + dt1 = tzinfo.localize(datetime.utcnow()) + timestamp = generate(dt1, utc=False, microseconds=True) + dt2 = parse(timestamp) +- eq_(dt1, dt2) ++ assert dt1 == dt2