Compare commits
No commits in common. "c8-stream-3.8" and "stream-python38-3.8-bootstrap-rhel-8.9.0" have entirely different histories.
c8-stream-
...
stream-pyt
|
@ -1 +1 @@
|
||||||
SOURCES/pytz-2019.3.tar.gz
|
/pytz-2019.3.tar.gz
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
fc320b8b76a6067f16bbc3b8c365766978b5252f SOURCES/pytz-2019.3.tar.gz
|
fc320b8b76a6067f16bbc3b8c365766978b5252f pytz-2019.3.tar.gz
|
||||||
|
|
|
@ -1,50 +0,0 @@
|
||||||
From 83155e2f3ecd3e136e1792611afd7faa48eb90f8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Lumir Balhar <lbalhar@redhat.com>
|
|
||||||
Date: Thu, 13 Jul 2023 12:05:29 +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 dda13b9..e3d5ccc 100644
|
|
||||||
--- a/pytz/tests/test_tzinfo.py
|
|
||||||
+++ b/pytz/tests/test_tzinfo.py
|
|
||||||
@@ -617,18 +617,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')
|
|
||||||
@@ -723,7 +723,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
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
Name: pytz
|
Name: pytz
|
||||||
Version: 2019.3
|
Version: 2019.3
|
||||||
Release: 4%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: World Timezone Definitions for Python
|
Summary: World Timezone Definitions for Python
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
|
@ -16,13 +16,6 @@ Source0: %pypi_source
|
||||||
Patch0: pytz-zoneinfo.patch
|
Patch0: pytz-zoneinfo.patch
|
||||||
# https://bugzilla.redhat.com/1497572
|
# https://bugzilla.redhat.com/1497572
|
||||||
Patch1: remove_tzinfo_test.patch
|
Patch1: remove_tzinfo_test.patch
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2217853
|
|
||||||
# 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
|
BuildArch: noarch
|
||||||
# Exclude i686 arch. Due to a modularity issue it's being added to the
|
# Exclude i686 arch. Due to a modularity issue it's being added to the
|
||||||
|
@ -120,10 +113,6 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jun 27 2023 Lumír Balhar <lbalhar@redhat.com> - 2019.3-4
|
|
||||||
- Fix FTBFS with newest tzdata
|
|
||||||
Resolves: rhbz#2217853
|
|
||||||
|
|
||||||
* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 2019.3-3
|
* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 2019.3-3
|
||||||
- Exclude unsupported i686 arch
|
- Exclude unsupported i686 arch
|
||||||
|
|
Loading…
Reference in New Issue