!9 update pytz to 2020.1

Merge pull request !9 from eaglegai/openEuler-20.03-LTS
update pytz to 2020.1
2020-08-28 16:18:39 +08:00 · 2020-08-28 12:02:49 +08:00 · 2020-05-12 10:02:20 +08:00 · 2020-05-11 20:37:13 +08:00 · 2020-02-03 13:21:11 +08:00 · 2020-01-21 15:21:26 +08:00
5 changed files with 125 additions and 10 deletions
--- a/0001-modify-timezone-from-Macau-to-Macao.patch
+++ b/0001-modify-timezone-from-Macau-to-Macao.patch
@ -0,0 +1,95 @@
+From 3d06fb69e66a519b11e4d4750c622210e6e7f0b5 Mon Sep 17 00:00:00 2001
+Date: Tue, 21 Jan 2020 15:14:50 +0800
+Subject: [PATCH] modify timezone from Macau to Macao
+
+---
+ pytz.egg-info/SOURCES.txt  | 3 +--
+ pytz/zoneinfo/iso3166.tab  | 2 +-
+ pytz/zoneinfo/tzdata.zi    | 4 ++--
+ pytz/zoneinfo/zone.tab     | 2 +-
+ pytz/zoneinfo/zone1970.tab | 2 +-
+ 5 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/pytz.egg-info/SOURCES.txt b/pytz.egg-info/SOURCES.txt
+index ecc09e9..a61115b 100644
+--- a/pytz.egg-info/SOURCES.txt
+++ b/pytz.egg-info/SOURCES.txt
+@@ -355,7 +355,6 @@ pytz/zoneinfo/Asia/Kuala_Lumpur
+ pytz/zoneinfo/Asia/Kuching
+ pytz/zoneinfo/Asia/Kuwait
+ pytz/zoneinfo/Asia/Macao
+-pytz/zoneinfo/Asia/Macau
+ pytz/zoneinfo/Asia/Magadan
+ pytz/zoneinfo/Asia/Makassar
+ pytz/zoneinfo/Asia/Manila
+@@ -615,4 +614,4 @@ pytz/zoneinfo/US/Indiana-Starke
+ pytz/zoneinfo/US/Michigan
+ pytz/zoneinfo/US/Mountain
+ pytz/zoneinfo/US/Pacific
+-pytz/zoneinfo/US/Samoa
+\ No newline at end of file
+pytz/zoneinfo/US/Samoa
+diff --git a/pytz/zoneinfo/iso3166.tab b/pytz/zoneinfo/iso3166.tab
+index a4ff61a..1c53cc0 100644
+--- a/pytz/zoneinfo/iso3166.tab
+++ b/pytz/zoneinfo/iso3166.tab
+@@ -170,7 +170,7 @@ MK	North Macedonia
+ ML	Mali
+ MM	Myanmar (Burma)
+ MN	Mongolia
+-MO	Macau
+MO	Macao
+ MP	Northern Mariana Islands
+ MQ	Martinique
+ MR	Mauritania
+diff --git a/pytz/zoneinfo/tzdata.zi b/pytz/zoneinfo/tzdata.zi
+index c720561..cf0c701 100644
+--- a/pytz/zoneinfo/tzdata.zi
+++ b/pytz/zoneinfo/tzdata.zi
+@@ -584,7 +584,7 @@ R _ 1973 o - D 30 3:30 1 D
+ R _ 1975 1976 - Ap Su>=16 3:30 1 D
+ R _ 1979 o - May 13 3:30 1 D
+ R _ 1979 o - O Su>=16 3:30 0 S
+-Z Asia/Macau 7:34:10 - LMT 1904 O 30
+Z Asia/Macao 7:34:10 - LMT 1904 O 30
+ 8 - CST 1941 D 21 23
+ 9 _ +09/+10 1945 S 30 24
+ 8 _ C%sT
+@@ -4324,7 +4324,7 @@ L Asia/Dhaka Asia/Dacca
+ L Asia/Shanghai Asia/Harbin
+ L Asia/Urumqi Asia/Kashgar
+ L Asia/Kathmandu Asia/Katmandu
+-L Asia/Macau Asia/Macao
+L Asia/Macao Asia/Macao
+ L Asia/Yangon Asia/Rangoon
+ L Asia/Ho_Chi_Minh Asia/Saigon
+ L Asia/Jerusalem Asia/Tel_Aviv
+diff --git a/pytz/zoneinfo/zone.tab b/pytz/zoneinfo/zone.tab
+index 408fcb2..ee58572 100644
+--- a/pytz/zoneinfo/zone.tab
+++ b/pytz/zoneinfo/zone.tab
+@@ -269,7 +269,7 @@ MM	+1647+09610	Asia/Yangon
+ MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
+ MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
+ MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
+-MO	+221150+1133230	Asia/Macau
+MO	+221150+1133230	Asia/Macao
+ MP	+1512+14545	Pacific/Saipan
+ MQ	+1436-06105	America/Martinique
+ MR	+1806-01557	Africa/Nouakchott
+diff --git a/pytz/zoneinfo/zone1970.tab b/pytz/zoneinfo/zone1970.tab
+index 822ffa1..03ec66b 100644
+--- a/pytz/zoneinfo/zone1970.tab
+++ b/pytz/zoneinfo/zone1970.tab
+@@ -232,7 +232,7 @@ MM	+1647+09610	Asia/Yangon
+ MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
+ MN	+4801+09139	Asia/Hovd	Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan
+ MN	+4804+11430	Asia/Choibalsan	Dornod, Sükhbaatar
+-MO	+221150+1133230	Asia/Macau
+MO	+221150+1133230	Asia/Macao
+ MQ	+1436-06105	America/Martinique
+ MT	+3554+01431	Europe/Malta
+ MU	-2010+05730	Indian/Mauritius
+-- 
+1.8.3.1
+
--- a/pytz-2019.2.tar.gz
+++ b/pytz-2019.2.tar.gz
--- a/pytz-2020.1.tar.gz
+++ b/pytz-2020.1.tar.gz
--- a/pytz-zoneinfo.patch
+++ b/pytz-zoneinfo.patch
@ -40,7 +40,7 @@ index d217c96..2b1ac03 100644
 
 --- pytz-2019.2/pytz/__init__.py~	2019-07-31 12:32:00.000000000 -0500
 +++ pytz-2019.2/pytz/__init__.py	2019-07-31 12:44:07.995969364 -0500
-@@ -495,1044 +495,37 @@
+@@ -495,1045 +495,37 @@
 
 if __name__ == '__main__':
     _test()
@ -220,6 +220,7 @@ index d217c96..2b1ac03 100644
 - 'America/North_Dakota/Beulah',
 - 'America/North_Dakota/Center',
 - 'America/North_Dakota/New_Salem',
+- 'America/Nuuk',
 - 'America/Ojinaga',
 - 'America/Panama',
 - 'America/Pangnirtung',
@ -759,7 +760,6 @@ index d217c96..2b1ac03 100644
 - 'America/Fort_Nelson',
 - 'America/Fortaleza',
 - 'America/Glace_Bay',
- 'America/Godthab',
 - 'America/Goose_Bay',
 - 'America/Grand_Turk',
 - 'America/Grenada',
@ -813,6 +813,7 @@ index d217c96..2b1ac03 100644
 - 'America/North_Dakota/Beulah',
 - 'America/North_Dakota/Center',
 - 'America/North_Dakota/New_Salem',
+- 'America/Nuuk',
 - 'America/Ojinaga',
 - 'America/Panama',
 - 'America/Pangnirtung',
--- a/pytz.spec
+++ b/pytz.spec
@ -1,13 +1,14 @@
 Name:		pytz
-Version:	2019.2
+Version:	2020.1
 Release:	1
 Summary:	World Timezone Definitions for Python
 License:	MIT
 URL:		http://pytz.sourceforge.net/
-Source0:	https://github.com/stub42/pytz/archive/pytz-2019.2.tar.gz
+Source0:	https://files.pythonhosted.org/packages/f4/f6/94fee50f4d54f58637d4b9987a1b862aeb6cd969e73623e02c5c00755577/pytz-2020.1.tar.gz

 Patch0:         pytz-zoneinfo.patch
 Patch1:         remove_tzinfo_test.patch
+Patch2:         0001-modify-timezone-from-Macau-to-Macao.patch

 BuildArch:  	noarch

@ -20,10 +21,8 @@ Python Library Reference (datetime.tzinfo).

 %package -n     python2-pytz
 Summary:        python2 for pytz
-BuildRequires:  python2-devel python2-pytest
+BuildRequires:  python2-devel python2-setuptools python2-pytest
 Requires:       tzdata
-Provides:       pytz = %{version}-%{release}
-Obsoletes:      pytz < %{version}-%{release}
 %{?python_provide:%python_provide python2-%{name}}

 %description -n python2-pytz
@ -31,7 +30,7 @@ python2 for pytz

 %package -n     python3-pytz
 Summary:        python3 for pytz
-BuildRequires:  python3-devel python3-pytest
+BuildRequires:  python3-devel python3-setuptools python3-pytest
 Requires:       tzdata
 %{?python_provide:%python_provide python3-%{name}}

@ -49,10 +48,12 @@ python3 for pytz
 %py2_install
 rm -r %{buildroot}%{python2_sitelib}/pytz/zoneinfo
 pathfix.py -pn -i %{__python2} %{buildroot}%{python2_sitelib}
+sed -i '/pytz\/zoneinfo\/Asia\/Macau/d' %{buildroot}%{python2_sitelib}/*.egg-info/SOURCES.txt

 %py3_install
 rm -r %{buildroot}%{python3_sitelib}/pytz/zoneinfo
 pathfix.py -pn -i %{__python3} %{buildroot}%{python3_sitelib}
+sed -i '/pytz\/zoneinfo\/Asia\/Macau/d' %{buildroot}%{python3_sitelib}/*.egg-info/SOURCES.txt

 %check
 PYTHONPATH=%{buildroot}%{python2_sitelib} %{__python2} -m pytest -v
@ -60,16 +61,34 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v

 %files -n       python2-pytz
 %defattr(-,root,root)
-%doc README.txt
+%doc README.rst
 %license LICENSE.txt
 %{python2_sitelib}/*

 %files -n       python3-pytz
 %defattr(-,root,root)
-%doc README.txt
+%doc README.rst
 %license LICENSE.txt
 %{python3_sitelib}/*

 %changelog
+* Wed Aug 26 2020 lunankun <lunankun@huawei.com> - 2020.1-1
+- Type:requirement
+- ID:NA
+- SUG:NA
+- DESC:update pytz to 2020.1
+
+* Fri Apr 17 2020 zhangrui <zhangrui182@huawei.com> - 2019.3-1
+- Type:update
+- ID:NA
+- SUG:NA
+- DESC:update to 2019.3
+
+* Tue Jan 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 2019.2-2
+- Type:bugfix
+- ID:NA
+- SUG:reboot
+- DESC:modify timezone from Macau to Macao
+
 * Thu Sep 12 2019 openEuler Buildteam <buildteam@openeuler.org> - 2019.2-1
 - Package init
Author	SHA1	Message	Date
openeuler-ci-bot	2865b47e92	!9 update pytz to 2020.1 Merge pull request !9 from eaglegai/openEuler-20.03-LTS	2020-08-28 16:18:39 +08:00
eaglegai	94d4cfa479	update pytz to 2020.1	2020-08-28 12:02:49 +08:00
openeuler-ci-bot	f28ebafdd2	!5 update to 2019.3 Merge pull request !5 from orange-snn/master	2020-05-12 10:02:20 +08:00
kircher	4fa2f12bf2	update to 2019.3	2020-05-11 20:37:13 +08:00
openeuler-ci-bot	b78fdf656b	!4 modify timezone from Macau to Macao Merge pull request !4 from huzunhao/master	2020-02-03 13:21:11 +08:00
fengtao	2ac120248f	modify timezone from Macau to Macao	2020-01-21 15:21:26 +08:00
openeuler-ci-bot	715118d08c	!2 回退 'Pull Request !1 : remove unnecessary patches' Merge pull request !2 from yanan-rock/revert-merge-1-master	2020-01-16 17:17:50 +08:00
yanan-rock	d79208ac51	回退 'Pull Request !1 : remove unnecessary patches'	2020-01-16 16:57:05 +08:00
openeuler-ci-bot	d676da7638	!1 remove unnecessary patches Merge pull request !1 from Anonymous_Z/anonymous_z	2020-01-11 22:41:50 +08:00
zhangrui	078e6f0f2f	remove unnecessary patch	2020-01-11 10:25:48 +08:00