diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
commit | 38423c67c8a23f6a1bc42038193182e2da3116eb (patch) | |
tree | 04e2cf4bd43601b77daa79fe654e409187093c5e /dev-python/jinja2-time | |
parent | 623ee73d661e5ed8475cb264511f683407d87365 (diff) |
gentoo resync : 25.04.2020
Diffstat (limited to 'dev-python/jinja2-time')
-rw-r--r-- | dev-python/jinja2-time/Manifest | 3 | ||||
-rw-r--r-- | dev-python/jinja2-time/files/jinja2-time-0.2.0-arrow-compat.patch | 38 | ||||
-rw-r--r-- | dev-python/jinja2-time/jinja2-time-0.2.0.ebuild | 18 |
3 files changed, 48 insertions, 11 deletions
diff --git a/dev-python/jinja2-time/Manifest b/dev-python/jinja2-time/Manifest index 6065bbe39096..4b792f65ddc8 100644 --- a/dev-python/jinja2-time/Manifest +++ b/dev-python/jinja2-time/Manifest @@ -1,3 +1,4 @@ +AUX jinja2-time-0.2.0-arrow-compat.patch 1655 BLAKE2B 7285125450d338d4e4c927761b5eb93778f51bd5b260fcdf1ac720006d61faaee2b928a869337cd6f9e7905140810ebe6047fd3c954501c86e1185f85f1517d3 SHA512 0286a608702bb445cf29da7900ec04f5b1f64d1e9658b84f9a90018adf5fce5cc959832abff73fa017afcaf0a0f6be85060e52a79038bf770b8b37d8c96a5e7d DIST jinja2-time-0.2.0.tar.gz 5701 BLAKE2B 370318000b1c91bc3460861d389da667f6d7e840c4f9d9d1661491c9bf1b422b8ecff12d1da2467e7a9596d12832790e314c3298672d70b38b92a53198df0156 SHA512 8ac4686312cde689f7a431001833d5d477030c4f5e9470d949bd07a40fcb9521f6ddcde37a72468093121ff9451e352a0bb43d20a796d7a204cf94e8a7545f2c -EBUILD jinja2-time-0.2.0.ebuild 627 BLAKE2B 79b4a34ab80605d7a924cae2795661a81db714da9a6d1392809addf98e30ce439a88784c7f8aeedcc016b164733995bf0bdac04bdcd3610277da0c7529129318 SHA512 a424789f22bc7658744749957509fe3eb75402f3e3eea7c8d8b0ef4f8c2c6ff9f10b5e80fd5142372db732917c512bc586a0b5b9d2e2fe414d749ab747e6f419 +EBUILD jinja2-time-0.2.0.ebuild 594 BLAKE2B 9f1fcfbe07f26ef8d49e37e5e46bd3264b0b093ea31195d3589e15cb55a4b1cee3cc550279c59fee6e3afb3c34baa164feaa7e7d33f56ff690ab402921b40711 SHA512 4a2f1cb2cb7287f3f951009a5a96bd3900896211a742f5d963cf4edd924084d2f3173ab5f79e1dc40a4421235bd3d16467ee7ea3b3a41efbfd53484643c95c14 MISC metadata.xml 375 BLAKE2B d28fc82eb5b6b82faf9e3874182b44290f10a1d2c2e7bb58e32cd46c6d724028e0bdf27670052f1665655ea0843900a1b978534ff8b32db986aa49531d4db76f SHA512 23697fa9d297ce1deaed947d2f5c98cfd85d9f10e4f703259db15d6deeacbed1ac4f297eed4b58d07b23c798ad738680c945395dc68f15cb0d083f7acb6d99ce diff --git a/dev-python/jinja2-time/files/jinja2-time-0.2.0-arrow-compat.patch b/dev-python/jinja2-time/files/jinja2-time-0.2.0-arrow-compat.patch new file mode 100644 index 000000000000..04d2993c453f --- /dev/null +++ b/dev-python/jinja2-time/files/jinja2-time-0.2.0-arrow-compat.patch @@ -0,0 +1,38 @@ +From aa4af9af0a0a5111a8ad21bc1b43bbdb586ee8af Mon Sep 17 00:00:00 2001 +From: Vincent Bernat <vincent@bernat.ch> +Date: Sun, 3 Nov 2019 07:48:08 +0100 +Subject: [PATCH] Use shift() instead of replace() to modify dates + +Previously, the `replace()` method from arrow was shifting the date +when the arguments were using the plural form. Since Arrow 0.9.0, this +has been deprecated in favor of a `shift()` method. Arrow 0.14.5 +completely removed the ability for `replace()` to shift dates. This +leads to errors like `AttributeError: unknown attribute: "hours"` when +using plural form. + +This commit replace the use of `replace()` by `shift()` since the +intent is always to shift the current date. +--- + jinja2_time/jinja2_time.py | 6 +++--- + setup.py | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/jinja2_time/jinja2_time.py b/jinja2_time/jinja2_time.py +index ce713cb..717c8a0 100755 +--- a/jinja2_time/jinja2_time.py ++++ b/jinja2_time/jinja2_time.py +@@ -19,11 +19,11 @@ def _datetime(self, timezone, operator, offset, datetime_format): + d = arrow.now(timezone) + + # Parse replace kwargs from offset and include operator +- replace_params = {} ++ shift_params = {} + for param in offset.split(','): + interval, value = param.split('=') +- replace_params[interval.strip()] = float(operator + value.strip()) +- d = d.replace(**replace_params) ++ shift_params[interval.strip()] = float(operator + value.strip()) ++ d = d.shift(**shift_params) + + if datetime_format is None: + datetime_format = self.environment.datetime_format diff --git a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild index eed27c8c8b51..ece803b2e17c 100644 --- a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild +++ b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit distutils-r1 DESCRIPTION="Jinja2 Extension for Dates and Times" @@ -13,15 +13,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" RDEPEND="dev-python/arrow[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}]" -DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] - dev-python/freezegun[${PYTHON_USEDEP}] - ${RDEPEND} )" +BDEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )" -python_test() { - py.test || die -} +distutils_enable_tests pytest + +PATCHES=( + "${FILESDIR}"/${P}-arrow-compat.patch +) |