Signed-off-by: Bastian Krause <[email protected]> --- Changes since v2: - port missed system timezone patch Changes since (implicit) v1: - use ptx/mirror-pypi macro for URL --- patches/pytz-2018.5/series | 1 - .../0001-use-system-timezone-data.patch | 10 +++------- patches/pytz-2020.1/series | 4 ++++ rules/python3-pytz.make | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 patches/pytz-2018.5/series rename patches/{pytz-2018.5 => pytz-2020.1}/0001-use-system-timezone-data.patch (86%) create mode 100644 patches/pytz-2020.1/series
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 similarity index 86% rename from patches/pytz-2018.5/0001-use-system-timezone-data.patch rename to 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 <[email protected]> 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 diff --git a/rules/python3-pytz.make b/rules/python3-pytz.make index bf7bb982a..b0a05a476 100644 --- a/rules/python3-pytz.make +++ b/rules/python3-pytz.make @@ -11,11 +11,11 @@ # PACKAGES-$(PTXCONF_PYTHON3_PYTZ) += python3-pytz -PYTHON3_PYTZ_VERSION := 2018.5 -PYTHON3_PYTZ_MD5 := 45409cbfa3927bdd2f3ee914dd5b1060 +PYTHON3_PYTZ_VERSION := 2020.1 +PYTHON3_PYTZ_MD5 := 0349106ac02f2bfe565dd6d5594e3a15 PYTHON3_PYTZ := pytz-$(PYTHON3_PYTZ_VERSION) PYTHON3_PYTZ_SUFFIX := tar.gz -PYTHON3_PYTZ_URL := https://pypi.python.org/packages/ca/a9/62f96decb1e309d6300ebe7eee9acfd7bccaeedd693794437005b9067b44/$(PYTHON3_PYTZ).$(PYTHON3_PYTZ_SUFFIX)\#md5=$(PYTHON3_PYTZ_MD5) +PYTHON3_PYTZ_URL := $(call ptx/mirror-pypi, pytz, $(PYTHON3_PYTZ).$(PYTHON3_PYTZ_SUFFIX)) PYTHON3_PYTZ_SOURCE := $(SRCDIR)/$(PYTHON3_PYTZ).$(PYTHON3_PYTZ_SUFFIX) PYTHON3_PYTZ_DIR := $(BUILDDIR)/$(PYTHON3_PYTZ) PYTHON3_PYTZ_LICENSE := MIT -- 2.28.0 _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
