rpms/pytz
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import CS pytz-2017.2-11.el8

Browse Source
This commit is contained in:
eabdullin 2023-09-27 14:02:15 +00:00
parent 909baedf2c
commit 66cb395a90
2 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
SOURCES/fix_ftbfs_with_newer_tzdata.patch Normal file
View File

@ -0,0 +1,50 @@
From c4bec783c884adc4ace6eea4eaa8748645b920bc Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Tue, 27 Jun 2023 18:28:20 +0200
Subject: [PATCH] Fix ftbfs with newer tzdata
Newer tzdata contains some corrections of timezones having effect
on years before 1930.
---
pytz/tests/test_tzinfo.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pytz/tests/test_tzinfo.py b/pytz/tests/test_tzinfo.py
index beb0490..094c2d3 100644
--- a/pytz/tests/test_tzinfo.py
+++ b/pytz/tests/test_tzinfo.py
@@ -605,18 +605,18 @@ class LocalTestCase(unittest.TestCase):
loc_time = loc_tz.localize(datetime(1930, 5, 10, 0, 0, 0))
# Actually +00:19:32, but Python datetime rounds this
- self.assertEqual(loc_time.strftime('%Z%z'), 'AMT+0020')
+ self.assertEqual(loc_time.strftime('%Z%z'), 'WEST+0100')
loc_time = loc_tz.localize(datetime(1930, 5, 20, 0, 0, 0))
# Actually +00:19:32, but Python datetime rounds this
- self.assertEqual(loc_time.strftime('%Z%z'), 'NST+0120')
+ self.assertEqual(loc_time.strftime('%Z%z'), 'WEST+0100')
loc_time = loc_tz.localize(datetime(1940, 5, 10, 0, 0, 0))
# pre-2017a, abbreviation was NCT
- self.assertEqual(loc_time.strftime('%Z%z'), '+0020+0020')
+ self.assertEqual(loc_time.strftime('%Z%z'), 'WEST+0100')
loc_time = loc_tz.localize(datetime(1940, 5, 20, 0, 0, 0))
- self.assertEqual(loc_time.strftime('%Z%z'), 'CEST+0200')
+ self.assertEqual(loc_time.strftime('%Z%z'), 'WEST+0100')
loc_time = loc_tz.localize(datetime(2004, 2, 1, 0, 0, 0))
self.assertEqual(loc_time.strftime('%Z%z'), 'CET+0100')
@@ -710,7 +710,7 @@ class LocalTestCase(unittest.TestCase):
loc_dt = utc_dt.astimezone(tz)
self.assertEqual(
loc_dt.strftime('%Y-%m-%d %H:%M:%S %Z%z'),
- '1914-01-01 14:00:00 AMT+0020'
+ '1914-01-01 13:40:00 WET+0000'
)
# And get back...
--
2.41.0

19
SPECS/pytz.spec
View File

@ -13,7 +13,7 @@
Name: pytz
Version: 2017.2
Release: 9%{?dist}
Release: 11%{?dist}
Summary: World Timezone Definitions for Python
Group: Development/Languages
@ -24,6 +24,14 @@ Source0: https://pypi.io/packages/source/p/%{name}/%{name}-%{version}.zip
Patch0: pytz-zoneinfo.patch
# https://bugzilla.redhat.com/1497572
Patch1: remove_tzinfo_test.patch
# https://bugzilla.redhat.com/2217873
# https://issues.redhat.com/browse/RHEL-677
# Upstream: https://github.com/stub42/pytz/commit/07aa4d962dae5cb7ced4f61fe85a9001a01676df
# Upstream changed the way it includes the tzdata which is something
# we cannot replicate downstream because we use the databse provided
# by tzdata component instead of the bundled one so the patch
# makes the tests pass with the latest version of tzdata.
Patch2: fix_ftbfs_with_newer_tzdata.patch
BuildArch: noarch
%if %{with python2}
@ -77,6 +85,7 @@ Almost all (over 540) of the Olson timezones are supported.
%setup -q
%patch0 -p1 -b .zoneinfo
%patch1 -p1 -b .removeTest
%patch2 -p1
%build
@ -129,6 +138,14 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -v
%changelog
* Thu Jul 13 2023 Lumír Balhar <lbalhar@redhat.com> - 2017.2-11
- Bump to add gating
Related: RHEL-677
* Tue Jun 27 2023 Lumír Balhar <lbalhar@redhat.com> - 2017.2-10
- Fix FTBFS with newest tzdata
Resolves: RHEL-677
* Fri Jun 22 2018 Charalampos Stratakis <cstratak@redhat.com> - 2017.2-9
- Conditionalize the python2 subpackage