Re: [ptxdist] [PATCH 2/4] python3-pytz: new package

[Michael Olbrich <m.olbrich@pengutronix.de>]

[-- Attachment #1: Type: text/plain, Size: 3768 bytes --]

On Fri, Aug 31, 2018 at 07:39:18PM +0200, Artur Wiebe wrote:
> Signed-off-by: Artur Wiebe <artur@4wiebe.de>
> ---
>  rules/python3-pytz.in   | 13 +++++++++++
>  rules/python3-pytz.make | 51 +++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 64 insertions(+)
>  create mode 100644 rules/python3-pytz.in
>  create mode 100644 rules/python3-pytz.make
> 
> diff --git a/rules/python3-pytz.in b/rules/python3-pytz.in
> new file mode 100644
> index 000000000..d2aff7acf
> --- /dev/null
> +++ b/rules/python3-pytz.in
> @@ -0,0 +1,13 @@
> +## SECTION=python3
> +
> +config PYTHON3_PYTZ
> +	tristate
> +	select PYTHON3
> +	select HOST_PYTHON3_SETUPTOOLS

	select TIMEZONE if RUNTIME

see below.

> +	prompt "pytz"
> +	help
> +	  pytz brings the Olson tz database into Python.
> +	  This library allows accurate and cross platform timezone calculations
> +	  using Python 2.4 or higher. It also solves the issue of ambiguous
> +	  times at the end of daylight saving time, which you can read
> +	  more about in the Python Library Reference (datetime.tzinfo).
> diff --git a/rules/python3-pytz.make b/rules/python3-pytz.make
> new file mode 100644
> index 000000000..c054ab850
> --- /dev/null
> +++ b/rules/python3-pytz.make
> @@ -0,0 +1,51 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2018 by Artur Wiebe <artur@4wiebe.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_PYTHON3_PYTZ) += python3-pytz
> +
> +PYTHON3_PYTZ_VERSION	:= 2018.5
> +PYTHON3_PYTZ_MD5	:= 45409cbfa3927bdd2f3ee914dd5b1060
> +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_SOURCE	:= $(SRCDIR)/$(PYTHON3_PYTZ).$(PYTHON3_PYTZ_SUFFIX)
> +PYTHON3_PYTZ_DIR	:= $(BUILDDIR)/$(PYTHON3_PYTZ)
> +PYTHON3_PYTZ_LICENSE	:= MIT
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +PYTHON3_PYTZ_CONF_TOOL    := python3
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/python3-pytz.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, python3-pytz)
> +	@$(call install_fixup,python3-pytz,PRIORITY,optional)
> +	@$(call install_fixup,python3-pytz,SECTION,base)
> +	@$(call install_fixup,python3-pytz,AUTHOR,"Artur Wiebe <artur@4wiebe.de>")
> +	@$(call install_fixup,python3-pytz,DESCRIPTION,missing)
> +
> +	@$(call install_glob, python3-pytz, 0, 0, -, \
> +		/usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages/pytz,, *.py)

This packages installs all timezone data. Please use the attached patch
(ist from Debian) and add */zoneinfo/* (I think) to the exclude patters of
install_glob.
This way the system timezone data is used.

Michael

> +
> +	@$(call install_finish,python3-pytz)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 2.18.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[-- Attachment #2: tzdata --]
[-- Type: text/plain, Size: 1496 bytes --]

Description: Use system zone information from the tzdata package
Author: Kurt Roeckx <kurt@roeckx.be>
Author: Hilko Bengen <bengen@debian.org>
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=416202
Forwarded: not-needed
Last-Update: 2018-02-14

Index: pytz-2018.3/pytz/tzfile.py
===================================================================
--- pytz-2018.3.orig/pytz/tzfile.py
+++ pytz-2018.3/pytz/tzfile.py
@@ -126,7 +126,8 @@ def build_tzinfo(zone, fp):
 if __name__ == '__main__':
     import os.path
     from pprint import pprint
-    base = os.path.join(os.path.dirname(__file__), 'zoneinfo')
+    # Patched in Debian, use the system zoninfo from the tzdata package
+    base = '/usr/share/zoneinfo'
     tz = build_tzinfo('Australia/Melbourne',
                       open(os.path.join(base, 'Australia', 'Melbourne'), 'rb'))
     tz = build_tzinfo('US/Eastern',
Index: pytz-2018.3/pytz/__init__.py
===================================================================
--- pytz-2018.3.orig/pytz/__init__.py
+++ pytz-2018.3/pytz/__init__.py
@@ -94,7 +94,7 @@ def open_resource(name):
     if zoneinfo_dir is not None:
         filename = os.path.join(zoneinfo_dir, *name_parts)
     else:
-        filename = os.path.join(os.path.dirname(__file__),
+        filename = os.path.join('/usr','share',
                                 'zoneinfo', *name_parts)
         if not os.path.exists(filename):
             # http://bugs.launchpad.net/bugs/383171 - we avoid using this

[-- Attachment #3: Type: text/plain, Size: 91 bytes --]

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de