From f6aca1436696e178bc43d83489fa71a900728050 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 14:44:03 +0000 Subject: [PATCH 01/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-pyrfc3339.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index d3adb18..fcfbe30 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -9,7 +9,7 @@ Name: python-pyrfc3339 Version: 1.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -97,6 +97,9 @@ nosetests-%{python3_version} tests.py %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From a863d1a3c90944b90685680af4dad5d8c7dbc0da Mon Sep 17 00:00:00 2001 From: Matthew Davis Date: Fri, 28 Jan 2022 16:42:42 -0500 Subject: [PATCH 02/22] Converted tests from python-nose to pytest --- python-pyrfc3339.spec | 15 +++++--- tests.py | 85 ++++++++++++++++++++++++------------------- 2 files changed, 57 insertions(+), 43 deletions(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index fcfbe30..25bd414 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -9,7 +9,7 @@ Name: python-pyrfc3339 Version: 1.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -25,14 +25,14 @@ BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-setuptools # --- unit tests --- -BuildRequires: python-nose +BuildRequires: pytest BuildRequires: pytz %endif BuildRequires: %{py3_prefix}-devel BuildRequires: %{py3_prefix}-setuptools # --- unit tests --- -BuildRequires: %{py3_prefix}-nose +BuildRequires: %{py3_prefix}-pytest BuildRequires: %{py3_prefix}-pytz %description @@ -77,9 +77,11 @@ RFC 3339-compliant timestamps using Python datetime.datetime objects. %check cp -a %{SOURCE1} . %if %{with python2} -nosetests-2.7 tests.py +py.test-2.7 -v tests.py +pytest-3 -v tests.py +%else +%pytest -v tests.py %endif -nosetests-%{python3_version} tests.py %if %{with python2} %files -n python2-pyrfc3339 @@ -97,6 +99,9 @@ nosetests-%{python3_version} tests.py %changelog +* Fri Jan 28 2022 Matthew Davis - 1.1-11 +- Converted tests from python-nose to pytest + * Fri Jan 21 2022 Fedora Release Engineering - 1.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/tests.py b/tests.py index 831daab..d4c7622 100644 --- a/tests.py +++ b/tests.py @@ -8,12 +8,11 @@ from copy import deepcopy from pyrfc3339 import generate, parse from pyrfc3339.utils import timezone +import unittest +import pytest import pytz -from nose.tools import eq_, raises - - -class TestCore(): +class TestCore(unittest.TestCase): ''' This test suite contains tests to address cases not tested in the doctests, as well as additional tests for end-to-end verification. @@ -24,8 +23,11 @@ class TestCore(): Test rounding of timezone values to the nearest second. ''' - eq_(timezone(5429), '+01:30') - eq_(timezone(5431), '+01:31') + if not timezone(5429) == '+01:30': + raise AssertionError("%r != %r" % (timezone(5429), '+01:30')) + + if not timezone(5431) == '+01:31': + raise AssertionError("%r != %r" % (timezone(5431), '+01:31')) def test_zero_offset(self): ''' @@ -34,11 +36,13 @@ class TestCore(): ''' timestamp = '2009-01-01T10:02:03+00:00' dt = parse(timestamp) - eq_(dt.tzinfo, pytz.utc) + if not dt.tzinfo == pytz.utc: + raise AssertionError("%r != %r" % (dt.tzinfo, pytz.utc)) timestamp = '2009-01-01T10:02:03-00:00' dt = parse(timestamp) - eq_(dt.tzinfo, pytz.utc) + if not dt.tzinfo == pytz.utc: + raise AssertionError("%r != %r" % (dt.tzinfo, pytz.utc)) def test_deepcopy(self): ''' @@ -56,7 +60,8 @@ class TestCore(): ''' timestamp = '2009-01-01T10:02:03.25Z' dt = parse(timestamp) - eq_(dt.microsecond, 250000) + if not dt.microsecond == 250000: + raise AssertionError("%r != %r" % (dt.microsecond, 250000)) def test_generate_microseconds(self): ''' @@ -65,7 +70,8 @@ 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') + if not timestamp == '2009-01-01T10:02:03.500000Z': + raise AssertionError("%r != %r" % (timestamp, '2009-01-01T10:02:03.500000Z')) def test_mixed_case(self): ''' @@ -76,7 +82,8 @@ class TestCore(): dt1 = parse('2009-01-01t10:01:02z') dt2 = datetime(2009, 1, 1, 10, 1, 2, tzinfo=pytz.utc) - eq_(dt1, dt2) + if not dt1 == dt2: + raise AssertionError("%r != %r" % (dt1, dt2)) def test_parse_naive_utc(self): ''' @@ -84,15 +91,17 @@ class TestCore(): ''' dt1 = parse('2009-01-01T10:01:02Z', produce_naive=True) - eq_(dt1.tzinfo, None) + if not dt1.tzinfo == None: + raise AssertionError("%r != %r" % (dt1.tzinfo, 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 self.assertRaises(ValueError) as context: + parse('2009-01-01T10:01:02-04:00', produce_naive=True) + def test_generate_utc_parse_utc(self): ''' @@ -103,7 +112,8 @@ class TestCore(): dt1 = dt1.replace(tzinfo=pytz.utc) dt2 = parse(generate(dt1, microseconds=True)) - eq_(dt1, dt2) + if not dt1 == dt2: + raise AssertionError("%r != %r" % (dt1, dt2)) def test_generate_local_parse_local(self): ''' @@ -113,7 +123,8 @@ 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) + if not dt1 == dt2: + raise AssertionError("%r != %r" % (dt1, dt2)) def test_generate_local_parse_utc(self): ''' @@ -123,10 +134,12 @@ class TestCore(): eastern = pytz.timezone('US/Eastern') dt1 = eastern.localize(datetime.utcnow()) dt2 = parse(generate(dt1, utc=False, microseconds=True)) - eq_(dt1, dt2) + if not dt1 == dt2: + raise AssertionError("%r != %r" % (dt1, dt2)) -class TestExhaustiveRoundtrip(): +@pytest.mark.parametrize('tz_name', pytz.all_timezones) +class TestExhaustiveRoundtrip: ''' This test suite exhaustively tests parsing and generation by generating a local RFC 3339 timestamp for every timezone supported by pytz, @@ -135,36 +148,32 @@ class TestExhaustiveRoundtrip(): slow = True - def test_local_roundtrip(self): - for tz_name in pytz.all_timezones: - yield self.local_roundtrip, tz_name - - def local_roundtrip(self, tz_name): + def test_local_roundtrip(self, tz_name): ''' Generates a local datetime using the given timezone, produces a local timestamp from the datetime, parses the timestamp to a local datetime, and verifies that the two datetimes are equal. ''' - tzinfo = pytz.timezone(tz_name) - dt1 = tzinfo.localize(datetime.utcnow()) - timestamp = generate(dt1, utc=False, microseconds=True) - dt2 = parse(timestamp, utc=False) - eq_(dt1, dt2) + if not tz_name == 'leapseconds': + tzinfo = pytz.timezone(tz_name) + dt1 = tzinfo.localize(datetime.utcnow()) + timestamp = generate(dt1, utc=False, microseconds=True) + dt2 = parse(timestamp, utc=False) + if not dt1 == dt2: + raise AssertionError("%r != %r" % (dt1, dt2)) - def test_utc_roundtrip(self): - for tz_name in pytz.all_timezones: - yield self.utc_roundtrip, tz_name - - def utc_roundtrip(self, tz_name): + def test_utc_roundtrip(self, tz_name): ''' Generates a local datetime using the given timezone, produces a local timestamp from the datetime, parses the timestamp to a UTC datetime, and verifies that the two datetimes are equal. ''' - tzinfo = pytz.timezone(tz_name) - dt1 = tzinfo.localize(datetime.utcnow()) - timestamp = generate(dt1, utc=False, microseconds=True) - dt2 = parse(timestamp) - eq_(dt1, dt2) + if not tz_name == 'leapseconds': + tzinfo = pytz.timezone(tz_name) + dt1 = tzinfo.localize(datetime.utcnow()) + timestamp = generate(dt1, utc=False, microseconds=True) + dt2 = parse(timestamp) + if not dt1 == dt2: + raise AssertionError("%r != %r" % (dt1, dt2)) From 23b0bafb53816f54e710fad3744ce1a825ae5552 Mon Sep 17 00:00:00 2001 From: Matthew Davis Date: Thu, 7 Apr 2022 18:46:22 -0400 Subject: [PATCH 03/22] Removed Python2 support Removed python2 support from specfile. --- python-pyrfc3339.spec | 44 +------------------------------------------ 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index 25bd414..6977a98 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -1,10 +1,4 @@ %global srcname pyRFC3339 -%if 0%{?rhel} && (0%{?rhel} <= 7) -%bcond_without python2 -%else -%bcond_with python2 -%endif - %global py3_prefix python%{python3_pkgversion} Name: python-pyrfc3339 @@ -21,13 +15,6 @@ Source0: %{pypi_source} Source1: https://raw.githubusercontent.com/kurtraschke/pyRFC3339/e30cc1555adce0ecc7bd65509a2249d47e5a41b4/pyrfc3339/tests/tests.py BuildArch: noarch -%if %{with python2} -BuildRequires: python2-devel -BuildRequires: python-setuptools -# --- unit tests --- -BuildRequires: pytest -BuildRequires: pytz -%endif BuildRequires: %{py3_prefix}-devel BuildRequires: %{py3_prefix}-setuptools @@ -39,16 +26,6 @@ BuildRequires: %{py3_prefix}-pytz This package contains a python library to parse and generate RFC 3339-compliant timestamps using Python datetime.datetime objects. -%if %{with python2} -%package -n python2-pyrfc3339 -Summary: %{summary} -%{?python_provide:%python_provide python2-pyrfc3339} - -%description -n python2-pyrfc3339 -This package contains a Python 2 library to parse and generate -RFC 3339-compliant timestamps using Python datetime.datetime objects. -%endif - %package -n %{py3_prefix}-pyrfc3339 Summary: Generate and parse RFC 3339 timestamps %{?python_provide:%python_provide python3-pyrfc3339} @@ -63,33 +40,14 @@ RFC 3339-compliant timestamps using Python datetime.datetime objects. %autosetup -n %{srcname}-%{version} %build -%if %{with python2} -%py2_build -%endif %py3_build %install -%if %{with python2} -%py2_install -%endif %py3_install %check cp -a %{SOURCE1} . -%if %{with python2} -py.test-2.7 -v tests.py -pytest-3 -v tests.py -%else %pytest -v tests.py -%endif - -%if %{with python2} -%files -n python2-pyrfc3339 -%doc README.rst -%license LICENSE.txt -%{python2_sitelib}/pyrfc3339 -%{python2_sitelib}/%{srcname}-%{version}-*.egg-info -%endif %files -n %{py3_prefix}-pyrfc3339 %doc README.rst @@ -99,7 +57,7 @@ pytest-3 -v tests.py %changelog -* Fri Jan 28 2022 Matthew Davis - 1.1-11 +* Thu Apr 07 2022 Matthew Davis - 1.1-11 - Converted tests from python-nose to pytest * Fri Jan 21 2022 Fedora Release Engineering - 1.1-10 From 8a2315b0cffa60421e43014afd9c91b5f4e32de8 Mon Sep 17 00:00:00 2001 From: Matthew Davis Date: Thu, 7 Apr 2022 22:08:49 -0400 Subject: [PATCH 04/22] Converted to pyproject macros Updated spec file to use pyproject macros --- python-pyrfc3339.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index 6977a98..f96fb60 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -17,10 +17,9 @@ Source1: https://raw.githubusercontent.com/kurtraschke/pyRFC3339/e30cc155 BuildArch: noarch BuildRequires: %{py3_prefix}-devel -BuildRequires: %{py3_prefix}-setuptools # --- unit tests --- +# Specified manually because upstream release tarballs do not contain unit tests BuildRequires: %{py3_prefix}-pytest -BuildRequires: %{py3_prefix}-pytz %description This package contains a python library to parse and generate @@ -34,31 +33,32 @@ Summary: Generate and parse RFC 3339 timestamps This package contains a Python 3 library to parse and generate RFC 3339-compliant timestamps using Python datetime.datetime objects. +%generate_buildrequires +%pyproject_buildrequires %prep %autosetup -n %{srcname}-%{version} %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install +%pyproject_save_files pyrfc3339 %check cp -a %{SOURCE1} . %pytest -v tests.py -%files -n %{py3_prefix}-pyrfc3339 +%files -n %{py3_prefix}-pyrfc3339 -f %{pyproject_files} %doc README.rst -%license LICENSE.txt -%{python3_sitelib}/pyrfc3339 -%{python3_sitelib}/%{srcname}-%{version}-*.egg-info - %changelog * Thu Apr 07 2022 Matthew Davis - 1.1-11 - Converted tests from python-nose to pytest +- Removed Python 2 support +- Converted to pyproject macros * Fri Jan 21 2022 Fedora Release Engineering - 1.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 1aa127ca26f37aeec38dd7d5d75f8289c2f98d93 Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Fri, 8 Apr 2022 22:29:18 +0200 Subject: [PATCH 05/22] replace "%{py3_prefix}" with "python3-" --- python-pyrfc3339.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index f96fb60..96fc6b6 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -1,5 +1,4 @@ %global srcname pyRFC3339 -%global py3_prefix python%{python3_pkgversion} Name: python-pyrfc3339 Version: 1.1 @@ -16,20 +15,20 @@ Source1: https://raw.githubusercontent.com/kurtraschke/pyRFC3339/e30cc155 BuildArch: noarch -BuildRequires: %{py3_prefix}-devel +BuildRequires: python3-devel # --- unit tests --- # Specified manually because upstream release tarballs do not contain unit tests -BuildRequires: %{py3_prefix}-pytest +BuildRequires: python3-pytest %description This package contains a python library to parse and generate RFC 3339-compliant timestamps using Python datetime.datetime objects. -%package -n %{py3_prefix}-pyrfc3339 +%package -n python3-pyrfc3339 Summary: Generate and parse RFC 3339 timestamps %{?python_provide:%python_provide python3-pyrfc3339} -%description -n %{py3_prefix}-pyrfc3339 +%description -n python3-pyrfc3339 This package contains a Python 3 library to parse and generate RFC 3339-compliant timestamps using Python datetime.datetime objects. @@ -51,7 +50,7 @@ RFC 3339-compliant timestamps using Python datetime.datetime objects. cp -a %{SOURCE1} . %pytest -v tests.py -%files -n %{py3_prefix}-pyrfc3339 -f %{pyproject_files} +%files -n python3-pyrfc3339 -f %{pyproject_files} %doc README.rst %changelog From 4c494443b73fdec21ccb4bf38a35395aaf41b2f9 Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Fri, 8 Apr 2022 22:47:21 +0200 Subject: [PATCH 06/22] use a proper patch file for pytest support instead of changing the source file directly Sources are supposed to be unmodified upstream versions. --- pyrfc3339-use-pytest-in-tests.patch | 195 ++++++++++++++++++++++++++++ python-pyrfc3339.spec | 7 +- tests.py | 85 ++++++------ 3 files changed, 238 insertions(+), 49 deletions(-) create mode 100644 pyrfc3339-use-pytest-in-tests.patch diff --git a/pyrfc3339-use-pytest-in-tests.patch b/pyrfc3339-use-pytest-in-tests.patch new file mode 100644 index 0000000..c216f53 --- /dev/null +++ b/pyrfc3339-use-pytest-in-tests.patch @@ -0,0 +1,195 @@ +commit a863d1a3c90944b90685680af4dad5d8c7dbc0da +Author: Matthew Davis +Date: Fri Jan 28 16:42:42 2022 -0500 + + Converted tests from python-nose to pytest + +diff --git a/tests.py b/tests.py +index 831daab..d4c7622 100644 +--- a/tests.py ++++ b/tests.py +@@ -8,12 +8,11 @@ from copy import deepcopy + + from pyrfc3339 import generate, parse + from pyrfc3339.utils import timezone ++import unittest ++import pytest + import pytz + +-from nose.tools import eq_, raises +- +- +-class TestCore(): ++class TestCore(unittest.TestCase): + ''' + This test suite contains tests to address cases not tested in the doctests, + as well as additional tests for end-to-end verification. +@@ -24,8 +23,11 @@ class TestCore(): + Test rounding of timezone values to the nearest second. + + ''' +- eq_(timezone(5429), '+01:30') +- eq_(timezone(5431), '+01:31') ++ if not timezone(5429) == '+01:30': ++ raise AssertionError("%r != %r" % (timezone(5429), '+01:30')) ++ ++ if not timezone(5431) == '+01:31': ++ raise AssertionError("%r != %r" % (timezone(5431), '+01:31')) + + def test_zero_offset(self): + ''' +@@ -34,11 +36,13 @@ class TestCore(): + ''' + timestamp = '2009-01-01T10:02:03+00:00' + dt = parse(timestamp) +- eq_(dt.tzinfo, pytz.utc) ++ if not dt.tzinfo == pytz.utc: ++ raise AssertionError("%r != %r" % (dt.tzinfo, pytz.utc)) + + timestamp = '2009-01-01T10:02:03-00:00' + dt = parse(timestamp) +- eq_(dt.tzinfo, pytz.utc) ++ if not dt.tzinfo == pytz.utc: ++ raise AssertionError("%r != %r" % (dt.tzinfo, pytz.utc)) + + def test_deepcopy(self): + ''' +@@ -56,7 +60,8 @@ class TestCore(): + ''' + timestamp = '2009-01-01T10:02:03.25Z' + dt = parse(timestamp) +- eq_(dt.microsecond, 250000) ++ if not dt.microsecond == 250000: ++ raise AssertionError("%r != %r" % (dt.microsecond, 250000)) + + def test_generate_microseconds(self): + ''' +@@ -65,7 +70,8 @@ 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') ++ if not timestamp == '2009-01-01T10:02:03.500000Z': ++ raise AssertionError("%r != %r" % (timestamp, '2009-01-01T10:02:03.500000Z')) + + def test_mixed_case(self): + ''' +@@ -76,7 +82,8 @@ class TestCore(): + dt1 = parse('2009-01-01t10:01:02z') + dt2 = datetime(2009, 1, 1, 10, 1, 2, tzinfo=pytz.utc) + +- eq_(dt1, dt2) ++ if not dt1 == dt2: ++ raise AssertionError("%r != %r" % (dt1, dt2)) + + def test_parse_naive_utc(self): + ''' +@@ -84,15 +91,17 @@ class TestCore(): + + ''' + dt1 = parse('2009-01-01T10:01:02Z', produce_naive=True) +- eq_(dt1.tzinfo, None) ++ if not dt1.tzinfo == None: ++ raise AssertionError("%r != %r" % (dt1.tzinfo, 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 self.assertRaises(ValueError) as context: ++ parse('2009-01-01T10:01:02-04:00', produce_naive=True) ++ + + def test_generate_utc_parse_utc(self): + ''' +@@ -103,7 +112,8 @@ class TestCore(): + dt1 = dt1.replace(tzinfo=pytz.utc) + + dt2 = parse(generate(dt1, microseconds=True)) +- eq_(dt1, dt2) ++ if not dt1 == dt2: ++ raise AssertionError("%r != %r" % (dt1, dt2)) + + def test_generate_local_parse_local(self): + ''' +@@ -113,7 +123,8 @@ 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) ++ if not dt1 == dt2: ++ raise AssertionError("%r != %r" % (dt1, dt2)) + + def test_generate_local_parse_utc(self): + ''' +@@ -123,10 +134,12 @@ class TestCore(): + eastern = pytz.timezone('US/Eastern') + dt1 = eastern.localize(datetime.utcnow()) + dt2 = parse(generate(dt1, utc=False, microseconds=True)) +- eq_(dt1, dt2) ++ if not dt1 == dt2: ++ raise AssertionError("%r != %r" % (dt1, dt2)) + + +-class TestExhaustiveRoundtrip(): ++@pytest.mark.parametrize('tz_name', pytz.all_timezones) ++class TestExhaustiveRoundtrip: + ''' + This test suite exhaustively tests parsing and generation by generating + a local RFC 3339 timestamp for every timezone supported by pytz, +@@ -135,36 +148,32 @@ class TestExhaustiveRoundtrip(): + + slow = True + +- def test_local_roundtrip(self): +- for tz_name in pytz.all_timezones: +- yield self.local_roundtrip, tz_name +- +- def local_roundtrip(self, tz_name): ++ def test_local_roundtrip(self, tz_name): + ''' + Generates a local datetime using the given timezone, + produces a local timestamp from the datetime, parses the timestamp + to a local datetime, and verifies that the two datetimes are equal. + + ''' +- tzinfo = pytz.timezone(tz_name) +- dt1 = tzinfo.localize(datetime.utcnow()) +- timestamp = generate(dt1, utc=False, microseconds=True) +- dt2 = parse(timestamp, utc=False) +- eq_(dt1, dt2) +- +- def test_utc_roundtrip(self): +- for tz_name in pytz.all_timezones: +- yield self.utc_roundtrip, tz_name ++ if not tz_name == 'leapseconds': ++ tzinfo = pytz.timezone(tz_name) ++ dt1 = tzinfo.localize(datetime.utcnow()) ++ timestamp = generate(dt1, utc=False, microseconds=True) ++ dt2 = parse(timestamp, utc=False) ++ if not dt1 == dt2: ++ raise AssertionError("%r != %r" % (dt1, dt2)) + +- def utc_roundtrip(self, tz_name): ++ def test_utc_roundtrip(self, tz_name): + ''' + Generates a local datetime using the given timezone, + produces a local timestamp from the datetime, parses the timestamp + to a UTC datetime, and verifies that the two datetimes are equal. + + ''' +- tzinfo = pytz.timezone(tz_name) +- dt1 = tzinfo.localize(datetime.utcnow()) +- timestamp = generate(dt1, utc=False, microseconds=True) +- dt2 = parse(timestamp) +- eq_(dt1, dt2) ++ if not tz_name == 'leapseconds': ++ tzinfo = pytz.timezone(tz_name) ++ dt1 = tzinfo.localize(datetime.utcnow()) ++ timestamp = generate(dt1, utc=False, microseconds=True) ++ dt2 = parse(timestamp) ++ if not dt1 == dt2: ++ raise AssertionError("%r != %r" % (dt1, dt2)) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index 96fc6b6..0ac3faf 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -12,6 +12,8 @@ Source0: %{pypi_source} # https://raw.githubusercontent.com/kurtraschke/pyRFC3339/master/pyrfc3339/tests/tests.py # v1.1: git commit e30cc155 Source1: https://raw.githubusercontent.com/kurtraschke/pyRFC3339/e30cc1555adce0ecc7bd65509a2249d47e5a41b4/pyrfc3339/tests/tests.py +# basically the same as https://github.com/kurtraschke/pyRFC3339/pull/16 +Patch1: pyrfc3339-use-pytest-in-tests.patch BuildArch: noarch @@ -37,7 +39,9 @@ RFC 3339-compliant timestamps using Python datetime.datetime objects. %prep -%autosetup -n %{srcname}-%{version} +%autosetup -n %{srcname}-%{version} -N +cp -a %{SOURCE1} . +%patch1 -p1 %build %pyproject_wheel @@ -47,7 +51,6 @@ RFC 3339-compliant timestamps using Python datetime.datetime objects. %pyproject_save_files pyrfc3339 %check -cp -a %{SOURCE1} . %pytest -v tests.py %files -n python3-pyrfc3339 -f %{pyproject_files} diff --git a/tests.py b/tests.py index d4c7622..831daab 100644 --- a/tests.py +++ b/tests.py @@ -8,11 +8,12 @@ from copy import deepcopy from pyrfc3339 import generate, parse from pyrfc3339.utils import timezone -import unittest -import pytest import pytz -class TestCore(unittest.TestCase): +from nose.tools import eq_, raises + + +class TestCore(): ''' This test suite contains tests to address cases not tested in the doctests, as well as additional tests for end-to-end verification. @@ -23,11 +24,8 @@ class TestCore(unittest.TestCase): Test rounding of timezone values to the nearest second. ''' - if not timezone(5429) == '+01:30': - raise AssertionError("%r != %r" % (timezone(5429), '+01:30')) - - if not timezone(5431) == '+01:31': - raise AssertionError("%r != %r" % (timezone(5431), '+01:31')) + eq_(timezone(5429), '+01:30') + eq_(timezone(5431), '+01:31') def test_zero_offset(self): ''' @@ -36,13 +34,11 @@ class TestCore(unittest.TestCase): ''' timestamp = '2009-01-01T10:02:03+00:00' dt = parse(timestamp) - if not dt.tzinfo == pytz.utc: - raise AssertionError("%r != %r" % (dt.tzinfo, pytz.utc)) + eq_(dt.tzinfo, pytz.utc) timestamp = '2009-01-01T10:02:03-00:00' dt = parse(timestamp) - if not dt.tzinfo == pytz.utc: - raise AssertionError("%r != %r" % (dt.tzinfo, pytz.utc)) + eq_(dt.tzinfo, pytz.utc) def test_deepcopy(self): ''' @@ -60,8 +56,7 @@ class TestCore(unittest.TestCase): ''' timestamp = '2009-01-01T10:02:03.25Z' dt = parse(timestamp) - if not dt.microsecond == 250000: - raise AssertionError("%r != %r" % (dt.microsecond, 250000)) + eq_(dt.microsecond, 250000) def test_generate_microseconds(self): ''' @@ -70,8 +65,7 @@ class TestCore(unittest.TestCase): ''' dt = datetime(2009, 1, 1, 10, 2, 3, 500000, pytz.utc) timestamp = generate(dt, microseconds=True) - if not timestamp == '2009-01-01T10:02:03.500000Z': - raise AssertionError("%r != %r" % (timestamp, '2009-01-01T10:02:03.500000Z')) + eq_(timestamp, '2009-01-01T10:02:03.500000Z') def test_mixed_case(self): ''' @@ -82,8 +76,7 @@ class TestCore(unittest.TestCase): dt1 = parse('2009-01-01t10:01:02z') dt2 = datetime(2009, 1, 1, 10, 1, 2, tzinfo=pytz.utc) - if not dt1 == dt2: - raise AssertionError("%r != %r" % (dt1, dt2)) + eq_(dt1, dt2) def test_parse_naive_utc(self): ''' @@ -91,17 +84,15 @@ class TestCore(unittest.TestCase): ''' dt1 = parse('2009-01-01T10:01:02Z', produce_naive=True) - if not dt1.tzinfo == None: - raise AssertionError("%r != %r" % (dt1.tzinfo, None)) + eq_(dt1.tzinfo, None) + @raises(ValueError) def test_parse_naive_local(self): ''' Test that parsing a local timestamp to a naive datetime fails. ''' - with self.assertRaises(ValueError) as context: - parse('2009-01-01T10:01:02-04:00', produce_naive=True) - + parse('2009-01-01T10:01:02-04:00', produce_naive=True) def test_generate_utc_parse_utc(self): ''' @@ -112,8 +103,7 @@ class TestCore(unittest.TestCase): dt1 = dt1.replace(tzinfo=pytz.utc) dt2 = parse(generate(dt1, microseconds=True)) - if not dt1 == dt2: - raise AssertionError("%r != %r" % (dt1, dt2)) + eq_(dt1, dt2) def test_generate_local_parse_local(self): ''' @@ -123,8 +113,7 @@ class TestCore(unittest.TestCase): eastern = pytz.timezone('US/Eastern') dt1 = eastern.localize(datetime.utcnow()) dt2 = parse(generate(dt1, utc=False, microseconds=True), utc=False) - if not dt1 == dt2: - raise AssertionError("%r != %r" % (dt1, dt2)) + eq_(dt1, dt2) def test_generate_local_parse_utc(self): ''' @@ -134,12 +123,10 @@ class TestCore(unittest.TestCase): eastern = pytz.timezone('US/Eastern') dt1 = eastern.localize(datetime.utcnow()) dt2 = parse(generate(dt1, utc=False, microseconds=True)) - if not dt1 == dt2: - raise AssertionError("%r != %r" % (dt1, dt2)) + eq_(dt1, dt2) -@pytest.mark.parametrize('tz_name', pytz.all_timezones) -class TestExhaustiveRoundtrip: +class TestExhaustiveRoundtrip(): ''' This test suite exhaustively tests parsing and generation by generating a local RFC 3339 timestamp for every timezone supported by pytz, @@ -148,32 +135,36 @@ class TestExhaustiveRoundtrip: slow = True - def test_local_roundtrip(self, tz_name): + def test_local_roundtrip(self): + for tz_name in pytz.all_timezones: + yield self.local_roundtrip, tz_name + + def local_roundtrip(self, tz_name): ''' Generates a local datetime using the given timezone, produces a local timestamp from the datetime, parses the timestamp to a local datetime, and verifies that the two datetimes are equal. ''' - if not tz_name == 'leapseconds': - tzinfo = pytz.timezone(tz_name) - dt1 = tzinfo.localize(datetime.utcnow()) - timestamp = generate(dt1, utc=False, microseconds=True) - dt2 = parse(timestamp, utc=False) - if not dt1 == dt2: - raise AssertionError("%r != %r" % (dt1, dt2)) + tzinfo = pytz.timezone(tz_name) + dt1 = tzinfo.localize(datetime.utcnow()) + timestamp = generate(dt1, utc=False, microseconds=True) + dt2 = parse(timestamp, utc=False) + eq_(dt1, dt2) - def test_utc_roundtrip(self, tz_name): + def test_utc_roundtrip(self): + for tz_name in pytz.all_timezones: + yield self.utc_roundtrip, tz_name + + def utc_roundtrip(self, tz_name): ''' Generates a local datetime using the given timezone, produces a local timestamp from the datetime, parses the timestamp to a UTC datetime, and verifies that the two datetimes are equal. ''' - if not tz_name == 'leapseconds': - tzinfo = pytz.timezone(tz_name) - dt1 = tzinfo.localize(datetime.utcnow()) - timestamp = generate(dt1, utc=False, microseconds=True) - dt2 = parse(timestamp) - if not dt1 == dt2: - raise AssertionError("%r != %r" % (dt1, dt2)) + tzinfo = pytz.timezone(tz_name) + dt1 = tzinfo.localize(datetime.utcnow()) + timestamp = generate(dt1, utc=False, microseconds=True) + dt2 = parse(timestamp) + eq_(dt1, dt2) From f4f701f1bc9b1468b8ddf84ac8a7682606566aea Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 17:37:07 +0200 Subject: [PATCH 07/22] Rebuilt for Python 3.11 --- python-pyrfc3339.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index 0ac3faf..70a9ef1 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -2,7 +2,7 @@ Name: python-pyrfc3339 Version: 1.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -57,6 +57,9 @@ cp -a %{SOURCE1} . %doc README.rst %changelog +* Mon Jun 13 2022 Python Maint - 1.1-12 +- Rebuilt for Python 3.11 + * Thu Apr 07 2022 Matthew Davis - 1.1-11 - Converted tests from python-nose to pytest - Removed Python 2 support From d4b14eda3989e9ad89c584bf26b90a21196adbad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 21:28:16 +0000 Subject: [PATCH 08/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-pyrfc3339.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index 70a9ef1..2eab2e2 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -2,7 +2,7 @@ Name: python-pyrfc3339 Version: 1.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -57,6 +57,9 @@ cp -a %{SOURCE1} . %doc README.rst %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 1.1-12 - Rebuilt for Python 3.11 From c6682ba44c56e49e2a2deae5daa5e4fa7810b1e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 16:20:17 +0000 Subject: [PATCH 09/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-pyrfc3339.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index 2eab2e2..d630d52 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -2,7 +2,7 @@ Name: python-pyrfc3339 Version: 1.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -57,6 +57,9 @@ cp -a %{SOURCE1} . %doc README.rst %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 1.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 2e5b8533b4418a4a14397293c8fd9b879d1185a7 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 23:20:06 +0200 Subject: [PATCH 10/22] Rebuilt for Python 3.12 --- python-pyrfc3339.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index d630d52..cb76300 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -2,7 +2,7 @@ Name: python-pyrfc3339 Version: 1.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -57,6 +57,9 @@ cp -a %{SOURCE1} . %doc README.rst %changelog +* Tue Jun 13 2023 Python Maint - 1.1-15 +- Rebuilt for Python 3.12 + * Fri Jan 20 2023 Fedora Release Engineering - 1.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 4797bfc268f6ac08b1288f603d668498180b4334 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 12:59:14 +0000 Subject: [PATCH 11/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-pyrfc3339.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index cb76300..d2786f3 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -2,7 +2,7 @@ Name: python-pyrfc3339 Version: 1.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -57,6 +57,9 @@ cp -a %{SOURCE1} . %doc README.rst %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 13 2023 Python Maint - 1.1-15 - Rebuilt for Python 3.12 From 320200860f61c9a2dff4f2c32edccaaf85c3035a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 05:52:52 +0000 Subject: [PATCH 12/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-pyrfc3339.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index d2786f3..a99d28a 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -2,7 +2,7 @@ Name: python-pyrfc3339 Version: 1.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -57,6 +57,9 @@ cp -a %{SOURCE1} . %doc README.rst %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 1.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 47395d06466c867065fc9e7c77372cb3ecb60ba3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 09:08:45 +0000 Subject: [PATCH 13/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-pyrfc3339.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index a99d28a..033c991 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -2,7 +2,7 @@ Name: python-pyrfc3339 Version: 1.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -57,6 +57,9 @@ cp -a %{SOURCE1} . %doc README.rst %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 1.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 1.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 69bbc22c0f05bb9424d0e501a58f7236ed392c7a Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 14/22] Eliminate use of obsolete %patchN syntax (#2283636) --- python-pyrfc3339.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index 033c991..f463a91 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -41,7 +41,7 @@ RFC 3339-compliant timestamps using Python datetime.datetime objects. %prep %autosetup -n %{srcname}-%{version} -N cp -a %{SOURCE1} . -%patch1 -p1 +%patch -P1 -p1 %build %pyproject_wheel From c09f8a169f63f3ab5faedd6759a71e98c01d9faa Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 11:12:09 +0200 Subject: [PATCH 15/22] Rebuilt for Python 3.13 --- python-pyrfc3339.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index f463a91..81bd694 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -2,7 +2,7 @@ Name: python-pyrfc3339 Version: 1.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -57,6 +57,9 @@ cp -a %{SOURCE1} . %doc README.rst %changelog +* Fri Jun 07 2024 Python Maint - 1.1-19 +- Rebuilt for Python 3.13 + * Fri Jan 26 2024 Fedora Release Engineering - 1.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0f6e069dfd1db2ebbc3ea2ace525e28f2a990bc1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 14:47:02 +0000 Subject: [PATCH 16/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- python-pyrfc3339.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index 81bd694..103cbe3 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -2,7 +2,7 @@ Name: python-pyrfc3339 Version: 1.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -57,6 +57,9 @@ cp -a %{SOURCE1} . %doc README.rst %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 1.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 1.1-19 - Rebuilt for Python 3.13 From 628cfdfd49df79610981ed5d10bde8939d012d53 Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Fri, 3 Jan 2025 21:54:33 +0100 Subject: [PATCH 17/22] update to 2.0.1 --- .gitignore | 1 + python-pyrfc3339.spec | 20 ++--- sources | 2 +- test_all.py | 155 ++++++++++++++++++++++++++++++++++++++ tests.py | 170 ------------------------------------------ 5 files changed, 167 insertions(+), 181 deletions(-) create mode 100644 test_all.py delete mode 100644 tests.py diff --git a/.gitignore b/.gitignore index b0426c4..9d6052a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /pyRFC3339-1.0.tar.gz /pyRFC3339-1.1.tar.gz +/pyrfc3339-2.0.1.tar.gz diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index 103cbe3..02bc08e 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -1,19 +1,17 @@ -%global srcname pyRFC3339 +%global srcname pyrfc3339 Name: python-pyrfc3339 -Version: 1.1 -Release: 20%{?dist} +Version: 2.0.1 +Release: 1%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT URL: https://pypi.python.org/pypi/pyRFC3339 Source0: %{pypi_source} # release tarballs do not contain unit tests (pyrfc3339/tests/tests.py) -# https://raw.githubusercontent.com/kurtraschke/pyRFC3339/master/pyrfc3339/tests/tests.py -# v1.1: git commit e30cc155 -Source1: https://raw.githubusercontent.com/kurtraschke/pyRFC3339/e30cc1555adce0ecc7bd65509a2249d47e5a41b4/pyrfc3339/tests/tests.py -# basically the same as https://github.com/kurtraschke/pyRFC3339/pull/16 -Patch1: pyrfc3339-use-pytest-in-tests.patch +# https://github.com/kurtraschke/pyRFC3339/blob/master/pyrfc3339/tests/test_all.py +# v2.0.1: git commit 53c2d1587d3a +Source1: https://raw.githubusercontent.com/kurtraschke/pyRFC3339/53c2d1587d3aac1734ddd4d4006a815df2d80f36/pyrfc3339/tests/test_all.py BuildArch: noarch @@ -41,7 +39,6 @@ RFC 3339-compliant timestamps using Python datetime.datetime objects. %prep %autosetup -n %{srcname}-%{version} -N cp -a %{SOURCE1} . -%patch -P1 -p1 %build %pyproject_wheel @@ -51,12 +48,15 @@ cp -a %{SOURCE1} . %pyproject_save_files pyrfc3339 %check -%pytest -v tests.py +%pytest -v test_all.py %files -n python3-pyrfc3339 -f %{pyproject_files} %doc README.rst %changelog +* Fri Jan 03 2025 Felix Schwarz - 2.0.1-1 +- update to 2.0.1 + * Fri Jul 19 2024 Fedora Release Engineering - 1.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 8423dc9..bb55905 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyRFC3339-1.1.tar.gz) = 958b7761fab590aa42bb57a955c5d834441f717796a452b60df21663099dcf2fc046afe60f8157fd0f1edfd95c5e9c9c5349ab10ca4078d210fc63d848496a2f +SHA512 (pyrfc3339-2.0.1.tar.gz) = b1c6768842a8fc8917280264e4fa3e2e1223399184bd7639fbb12d3bd4755ea2cadfb291efe2bf1f3b7e89e50fcb1f89a46a9e81a94cca3a5ca0aa8c0b698c69 diff --git a/test_all.py b/test_all.py new file mode 100644 index 0000000..ed47f20 --- /dev/null +++ b/test_all.py @@ -0,0 +1,155 @@ +""" +Test suite for pyRFC3339. + +""" + +import unittest +import zoneinfo +from datetime import datetime, timezone +from zoneinfo import ZoneInfo + +from pyrfc3339 import generate, parse + + +class TestCore(unittest.TestCase): + """ + This test case contains tests to address cases not tested in the doctests, + as well as additional tests for end-to-end verification. + + """ + + def test_zero_offset(self) -> None: + """ + Both +00:00 and -00:00 are equivalent to the offset 'Z' (UTC). + + """ + timestamp = "2009-01-01T10:02:03+00:00" + dt = parse(timestamp) + self.assertEqual(dt.tzinfo, timezone.utc) + + timestamp = "2009-01-01T10:02:03-00:00" + dt = parse(timestamp) + self.assertEqual(dt.tzinfo, timezone.utc) + + def test_parse_microseconds(self) -> None: + """ + Test parsing timestamps with microseconds. + + """ + timestamp = "2009-01-01T10:02:03.25Z" + dt = parse(timestamp) + self.assertEqual(dt.microsecond, 250000) + + def test_generate_microseconds(self) -> None: + """ + Test generating timestamps with microseconds. + + """ + dt = datetime(2009, 1, 1, 10, 2, 3, 500000, tzinfo=timezone.utc) + timestamp = generate(dt, microseconds=True) + self.assertEqual(timestamp, "2009-01-01T10:02:03.500000Z") + + def test_mixed_case(self) -> None: + """ + Timestamps may use either 'T' or 't' and either 'Z' or 'z' + according to :RFC:`3339`. + + """ + dt1 = parse("2009-01-01t10:01:02z") + dt2 = datetime(2009, 1, 1, 10, 1, 2, tzinfo=timezone.utc) + + self.assertEqual(dt1, dt2) + + def test_parse_naive_utc(self) -> None: + """ + Test parsing a UTC timestamp to a naive datetime. + + """ + dt1 = parse("2009-01-01T10:01:02Z", produce_naive=True) + self.assertEqual(dt1.tzinfo, None) + + def test_parse_naive_local(self) -> None: + """ + Test that parsing a local timestamp to a naive datetime fails. + + """ + with self.assertRaises(ValueError): + parse("2009-01-01T10:01:02-04:00", produce_naive=True) + + def test_generate_utc_parse_utc(self) -> None: + """ + Generate a UTC timestamp and parse it into a UTC datetime. + + """ + dt1 = datetime.now(timezone.utc) + + dt2 = parse(generate(dt1, microseconds=True)) + self.assertEqual(dt1, dt2) + + def test_generate_local_parse_local(self) -> None: + """ + Generate a local timestamp and parse it into a local datetime. + + """ + eastern = ZoneInfo("US/Eastern") + dt1 = datetime.now(eastern) + dt2 = parse(generate(dt1, utc=False, microseconds=True), utc=False) + self.assertEqual(dt1, dt2) + + def test_generate_local_parse_utc(self) -> None: + """ + Generate a local timestamp and parse it into a UTC datetime. + + """ + eastern = ZoneInfo("US/Eastern") + dt1 = datetime.now(eastern) + dt2 = parse(generate(dt1, utc=False, microseconds=True)) + self.assertEqual(dt1, dt2) + + @unittest.skip("fails due to python/cpython#120713") + def test_three_digit_year(self) -> None: + dt = datetime(999, 1, 1, 0, 0, 0, tzinfo=timezone.utc) + self.assertEqual(generate(dt), "0999-01-01T00:00:00Z") + + +class TestExhaustiveRoundtrip(unittest.TestCase): + """ + This test case exhaustively tests parsing and generation by generating + a local RFC 3339 timestamp for every timezone supported by `zoneinfo`, + parsing that timestamp into a local datetime and a UTC datetime + and asserting that those represent the same instant. + + """ + + def setUp(self) -> None: + self.available_timezones = zoneinfo.available_timezones() + + def test_local_roundtrip(self) -> None: + """ + Generates a local datetime using the given timezone, + produces a local timestamp from the datetime, parses the timestamp + to a local datetime, and verifies that the two datetimes are equal. + + """ + for tz_name in self.available_timezones: + with self.subTest(tz=tz_name): + tzinfo = ZoneInfo(tz_name) + dt1 = datetime.now(tzinfo) + timestamp = generate(dt1, utc=False, microseconds=True) + dt2 = parse(timestamp, utc=False) + self.assertEqual(dt1, dt2) + + def test_utc_roundtrip(self) -> None: + """ + Generates a local datetime using the given timezone, + produces a local timestamp from the datetime, parses the timestamp + to a UTC datetime, and verifies that the two datetimes are equal. + + """ + for tz_name in self.available_timezones: + with self.subTest(tz=tz_name): + tzinfo = ZoneInfo(tz_name) + dt1 = datetime.now(tzinfo) + timestamp = generate(dt1, utc=False, microseconds=True) + dt2 = parse(timestamp) + self.assertEqual(dt1, dt2) diff --git a/tests.py b/tests.py deleted file mode 100644 index 831daab..0000000 --- a/tests.py +++ /dev/null @@ -1,170 +0,0 @@ -''' -Test suite for pyRFC3339. - -''' - -from datetime import datetime -from copy import deepcopy - -from pyrfc3339 import generate, parse -from pyrfc3339.utils import timezone -import pytz - -from nose.tools import eq_, raises - - -class TestCore(): - ''' - This test suite contains tests to address cases not tested in the doctests, - as well as additional tests for end-to-end verification. - - ''' - def test_timezone_rounding(self): - ''' - Test rounding of timezone values to the nearest second. - - ''' - eq_(timezone(5429), '+01:30') - eq_(timezone(5431), '+01:31') - - def test_zero_offset(self): - ''' - Both +00:00 and -00:00 are equivalent to the offset 'Z' (UTC). - - ''' - timestamp = '2009-01-01T10:02:03+00:00' - dt = parse(timestamp) - eq_(dt.tzinfo, pytz.utc) - - timestamp = '2009-01-01T10:02:03-00:00' - dt = parse(timestamp) - eq_(dt.tzinfo, pytz.utc) - - def test_deepcopy(self): - ''' - Tests that deepcopy works and doesn't crash - - ''' - timestamp = '2009-01-01T10:02:03+02:00' - dt = parse(timestamp) - deepcopy(dt) - - def test_parse_microseconds(self): - ''' - Test parsing timestamps with microseconds. - - ''' - timestamp = '2009-01-01T10:02:03.25Z' - dt = parse(timestamp) - eq_(dt.microsecond, 250000) - - def test_generate_microseconds(self): - ''' - Test generating timestamps with microseconds. - - ''' - dt = datetime(2009, 1, 1, 10, 2, 3, 500000, pytz.utc) - timestamp = generate(dt, microseconds=True) - eq_(timestamp, '2009-01-01T10:02:03.500000Z') - - def test_mixed_case(self): - ''' - Timestamps may use either 'T' or 't' and either 'Z' or 'z' - according to :RFC:`3339`. - - ''' - dt1 = parse('2009-01-01t10:01:02z') - dt2 = datetime(2009, 1, 1, 10, 1, 2, tzinfo=pytz.utc) - - eq_(dt1, dt2) - - def test_parse_naive_utc(self): - ''' - Test parsing a UTC timestamp to a naive datetime. - - ''' - dt1 = parse('2009-01-01T10:01:02Z', produce_naive=True) - eq_(dt1.tzinfo, 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) - - def test_generate_utc_parse_utc(self): - ''' - Generate a UTC timestamp and parse it into a UTC datetime. - - ''' - dt1 = datetime.utcnow() - dt1 = dt1.replace(tzinfo=pytz.utc) - - dt2 = parse(generate(dt1, microseconds=True)) - eq_(dt1, dt2) - - def test_generate_local_parse_local(self): - ''' - Generate a local timestamp and parse it into a local datetime. - - ''' - eastern = pytz.timezone('US/Eastern') - dt1 = eastern.localize(datetime.utcnow()) - dt2 = parse(generate(dt1, utc=False, microseconds=True), utc=False) - eq_(dt1, dt2) - - def test_generate_local_parse_utc(self): - ''' - Generate a local timestamp and parse it into a UTC datetime. - - ''' - eastern = pytz.timezone('US/Eastern') - dt1 = eastern.localize(datetime.utcnow()) - dt2 = parse(generate(dt1, utc=False, microseconds=True)) - eq_(dt1, dt2) - - -class TestExhaustiveRoundtrip(): - ''' - This test suite exhaustively tests parsing and generation by generating - a local RFC 3339 timestamp for every timezone supported by pytz, - and parsing that timestamp into a local datetime and a UTC datetime. - ''' - - slow = True - - def test_local_roundtrip(self): - for tz_name in pytz.all_timezones: - yield self.local_roundtrip, tz_name - - def local_roundtrip(self, tz_name): - ''' - Generates a local datetime using the given timezone, - produces a local timestamp from the datetime, parses the timestamp - to a local datetime, and verifies that the two datetimes are equal. - - ''' - tzinfo = pytz.timezone(tz_name) - dt1 = tzinfo.localize(datetime.utcnow()) - timestamp = generate(dt1, utc=False, microseconds=True) - dt2 = parse(timestamp, utc=False) - eq_(dt1, dt2) - - def test_utc_roundtrip(self): - for tz_name in pytz.all_timezones: - yield self.utc_roundtrip, tz_name - - def utc_roundtrip(self, tz_name): - ''' - Generates a local datetime using the given timezone, - produces a local timestamp from the datetime, parses the timestamp - to a UTC datetime, and verifies that the two datetimes are equal. - - ''' - tzinfo = pytz.timezone(tz_name) - dt1 = tzinfo.localize(datetime.utcnow()) - timestamp = generate(dt1, utc=False, microseconds=True) - dt2 = parse(timestamp) - eq_(dt1, dt2) From 1a4206f8728aba0f6fe80f4cb76278b8d22bf9f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 18:06:33 +0000 Subject: [PATCH 18/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- python-pyrfc3339.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index 02bc08e..197223a 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -2,7 +2,7 @@ Name: python-pyrfc3339 Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -54,6 +54,9 @@ cp -a %{SOURCE1} . %doc README.rst %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 2.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jan 03 2025 Felix Schwarz - 2.0.1-1 - update to 2.0.1 From 5b441f661d5f91bce1734669665e1516188236fa Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 22:51:57 +0200 Subject: [PATCH 19/22] Rebuilt for Python 3.14 --- python-pyrfc3339.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index 197223a..d367991 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -2,7 +2,7 @@ Name: python-pyrfc3339 Version: 2.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -54,6 +54,9 @@ cp -a %{SOURCE1} . %doc README.rst %changelog +* Mon Jun 02 2025 Python Maint - 2.0.1-3 +- Rebuilt for Python 3.14 + * Sat Jan 18 2025 Fedora Release Engineering - 2.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b7065f788d1ab61ae0b69b75eae615b2c85c91be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 09:47:55 +0000 Subject: [PATCH 20/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- python-pyrfc3339.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index d367991..225a6e7 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -2,7 +2,7 @@ Name: python-pyrfc3339 Version: 2.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -54,6 +54,9 @@ cp -a %{SOURCE1} . %doc README.rst %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 02 2025 Python Maint - 2.0.1-3 - Rebuilt for Python 3.14 From 6e7f79fbe3c34ef08d9a9b428ffc11dd258a633e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 14:35:01 +0200 Subject: [PATCH 21/22] Rebuilt for Python 3.14.0rc2 bytecode --- python-pyrfc3339.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index 225a6e7..8fc8b3a 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -2,7 +2,7 @@ Name: python-pyrfc3339 Version: 2.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -54,6 +54,9 @@ cp -a %{SOURCE1} . %doc README.rst %changelog +* Fri Aug 15 2025 Python Maint - 2.0.1-5 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 2.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From b260403f1d4a9ace14e234abda36b21e5eed80b4 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:09:54 +0200 Subject: [PATCH 22/22] Rebuilt for Python 3.14.0rc3 bytecode --- python-pyrfc3339.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyrfc3339.spec b/python-pyrfc3339.spec index 8fc8b3a..8727d46 100644 --- a/python-pyrfc3339.spec +++ b/python-pyrfc3339.spec @@ -2,7 +2,7 @@ Name: python-pyrfc3339 Version: 2.0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Generate and parse RFC 3339 timestamps License: MIT @@ -54,6 +54,9 @@ cp -a %{SOURCE1} . %doc README.rst %changelog +* Fri Sep 19 2025 Python Maint - 2.0.1-6 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 2.0.1-5 - Rebuilt for Python 3.14.0rc2 bytecode