summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorBastian Krause <bst@pengutronix.de>2020-09-22 16:14:32 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-09-23 18:32:25 +0200
commitb4d197a654ff53795279576cef40e401fd6a6759 (patch)
tree51085b57c354919a77c43333d692b142151b9720 /patches
parentfccc6201bbb31ef509a6c8ebeff4b7b3453f2265 (diff)
downloadptxdist-b4d197a654ff53795279576cef40e401fd6a6759.tar.gz
ptxdist-b4d197a654ff53795279576cef40e401fd6a6759.tar.xz
python3-pytz: version bump 2018.5 -> 2020.1
Signed-off-by: Bastian Krause <bst@pengutronix.de> Message-Id: <20200922141434.8544-17-bst@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/pytz-2018.5/series1
-rw-r--r--patches/pytz-2020.1/0001-use-system-timezone-data.patch (renamed from patches/pytz-2018.5/0001-use-system-timezone-data.patch)10
-rw-r--r--patches/pytz-2020.1/series4
3 files changed, 7 insertions, 8 deletions
diff --git a/patches/pytz-2018.5/series b/patches/pytz-2018.5/series
deleted file mode 100644
index f205d3297..000000000
--- a/patches/pytz-2018.5/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-use-system-timezone-data.patch
diff --git a/patches/pytz-2018.5/0001-use-system-timezone-data.patch b/patches/pytz-2020.1/0001-use-system-timezone-data.patch
index def117ee7..113ff9ae9 100644
--- a/patches/pytz-2018.5/0001-use-system-timezone-data.patch
+++ b/patches/pytz-2020.1/0001-use-system-timezone-data.patch
@@ -1,4 +1,3 @@
-From 09acc56fe52e53042c8d2dcb458b017de55a626d Mon Sep 17 00:00:00 2001
From: Artur Wiebe <artur@4wiebe.de>
Date: Tue, 11 Sep 2018 10:07:27 +0200
Subject: [PATCH] use system timezone data
@@ -9,10 +8,10 @@ Subject: [PATCH] use system timezone data
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pytz/__init__.py b/pytz/__init__.py
-index 120fab4..006db4d 100644
+index 0c065e46b021..7e8bc8e65337 100644
--- a/pytz/__init__.py
+++ b/pytz/__init__.py
-@@ -91,7 +91,7 @@ def open_resource(name):
+@@ -92,7 +92,7 @@ def open_resource(name):
if zoneinfo_dir is not None:
filename = os.path.join(zoneinfo_dir, *name_parts)
else:
@@ -22,7 +21,7 @@ index 120fab4..006db4d 100644
if not os.path.exists(filename):
# http://bugs.launchpad.net/bugs/383171 - we avoid using this
diff --git a/pytz/tzfile.py b/pytz/tzfile.py
-index 25117f3..e06ce77 100644
+index 25117f325257..e06ce774e84d 100644
--- a/pytz/tzfile.py
+++ b/pytz/tzfile.py
@@ -126,7 +126,8 @@ def build_tzinfo(zone, fp):
@@ -35,6 +34,3 @@ index 25117f3..e06ce77 100644
tz = build_tzinfo('Australia/Melbourne',
open(os.path.join(base, 'Australia', 'Melbourne'), 'rb'))
tz = build_tzinfo('US/Eastern',
---
-2.18.0
-
diff --git a/patches/pytz-2020.1/series b/patches/pytz-2020.1/series
new file mode 100644
index 000000000..5e91bdc15
--- /dev/null
+++ b/patches/pytz-2020.1/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-use-system-timezone-data.patch
+# 2736325ecd6cf493887c381d1a571372 - git-ptx-patches magic