commit: 8f29fe578854be07adb222f92f02b13992a96c8d Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Mar 19 21:52:36 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Mar 19 21:56:27 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f29fe57
dev-python/freezegun: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/freezegun/Manifest | 1 - .../freezegun/files/freezegun-0.3.12-py38.patch | 122 --------------------- .../freezegun/files/freezegun-0.3.12-tests.patch | 13 --- dev-python/freezegun/freezegun-0.3.12-r1.ebuild | 55 ---------- 4 files changed, 191 deletions(-) diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest index 6445e30d280..72507499306 100644 --- a/dev-python/freezegun/Manifest +++ b/dev-python/freezegun/Manifest @@ -1,2 +1 @@ -DIST freezegun-0.3.12.tar.gz 24346 BLAKE2B 09d7c662a82d7b7fa6ae56c09bff0d73e2b63fba2b492620cd8e68ee06a15129a7e901418d1881e65b440babcfe0d014ad3574ab8dd2c7eab8486b3d868273ac SHA512 f7d98ea84735b24380fa53e1e62622fe91be5a35cb75221ca4cb02418add9b0a4add9b2f691242be75acbc45d4745fef82ffe3c89890dcdffa4405940e527af4 DIST freezegun-0.3.15.tar.gz 25530 BLAKE2B 866736cfe556da50f8edba55b0b84c7365e6a1bf32d88e84dfcee6046474b30a9ea15522c3356c5ca30f9a8b79096ba17fdaab240f20e4ef1f91b25ec8262716 SHA512 9f3836f8c9f207d9bccbcaec3f1af977b26aa3699ad5f792d052e105a0de530c6dda1641480c9cd551627186bf0c65d92bf39a6f4a61f458f762d8aa999180ba diff --git a/dev-python/freezegun/files/freezegun-0.3.12-py38.patch b/dev-python/freezegun/files/freezegun-0.3.12-py38.patch deleted file mode 100644 index d35303bf9fe..00000000000 --- a/dev-python/freezegun/files/freezegun-0.3.12-py38.patch +++ /dev/null @@ -1,122 +0,0 @@ -commit 4d998c9d6b130ed4e2d54cb96b010fec749a9c59 -Author: xtreak <[email protected]> -Date: Wed Jun 19 14:54:22 2019 +0000 - - Patch time.time_ns to support Python 3.8 - -diff --git a/CHANGELOG b/CHANGELOG -index efac4d3..14d96be 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -11,6 +11,7 @@ Latest - * Ignore Selenium - * Move to pytest - * Conditionally patch time.clock -+* Patch time.time_ns added in Python 3.7 - - 0.3.11 - ------ -@@ -57,4 +58,4 @@ Latest - - * Add `tick` argument to allow time to move forward - * Performance improvements --* Fix timezone example in README -\ No newline at end of file -+* Fix timezone example in README -diff --git a/freezegun/api.py b/freezegun/api.py -index 5e7d7fa..bc61270 100644 ---- a/freezegun/api.py -+++ b/freezegun/api.py -@@ -20,6 +20,7 @@ try: - except ImportError: - MayaDT = None - -+_TIME_NS_PRESENT = hasattr(time, 'time_ns') - - real_time = time.time - real_localtime = time.localtime -@@ -28,6 +29,11 @@ real_strftime = time.strftime - real_date = datetime.date - real_datetime = datetime.datetime - real_date_objects = [real_time, real_localtime, real_gmtime, real_strftime, real_date, real_datetime] -+ -+if _TIME_NS_PRESENT: -+ real_time_ns = time.time_ns -+ real_date_objects.append(real_time_ns) -+ - _real_time_object_ids = set(id(obj) for obj in real_date_objects) - - # time.clock is deprecated and was removed in Python 3.8 -@@ -175,6 +181,12 @@ def fake_time(): - current_time = get_current_time() - return calendar.timegm(current_time.timetuple()) + current_time.microsecond / 1000000.0 - -+if _TIME_NS_PRESENT: -+ def fake_time_ns(): -+ if _should_use_real_time(): -+ return real_time_ns() -+ return int(int(fake_time()) * 1e9) -+ - - def fake_localtime(t=None): - if t is not None: -@@ -331,7 +343,7 @@ class FakeDatetime(with_metaclass(FakeDatetimeMeta, real_datetime, FakeDate)): - - def date(self): - return date_to_fakedate(self) -- -+ - @property - def nanosecond(self): - try: -@@ -599,6 +611,10 @@ class _freeze_time(object): - ('real_time', real_time, fake_time), - ] - -+ if _TIME_NS_PRESENT: -+ time.time_ns = fake_time_ns -+ to_patch.append(('real_time_ns', real_time_ns, fake_time_ns)) -+ - if real_clock is not None: - # time.clock is deprecated and was removed in Python 3.8 - time.clock = fake_clock -@@ -741,7 +757,7 @@ def freeze_time(time_to_freeze=None, tz_offset=0, ignore=None, tick=False, as_ar - ignore.append('selenium') - ignore.append('_pytest.terminal.') - ignore.append('_pytest.runner.') -- -+ - return _freeze_time(time_to_freeze, tz_offset, ignore, tick, as_arg, auto_tick_seconds) - - -diff --git a/tests/test_datetimes.py b/tests/test_datetimes.py -index cfef4a1..688fdce 100644 ---- a/tests/test_datetimes.py -+++ b/tests/test_datetimes.py -@@ -19,6 +19,7 @@ except ImportError: - - # time.clock was removed in Python 3.8 - HAS_CLOCK = hasattr(time, 'clock') -+HAS_TIME_NS = hasattr(time, 'time_ns') - - class temp_locale(object): - """Temporarily change the locale.""" -@@ -656,3 +657,18 @@ def test_should_use_real_time(): - assert time.gmtime() != expected_frozen_gmt - if HAS_CLOCK: - assert time.clock() != expected_clock -+ -+ [email protected](not HAS_TIME_NS, -+ reason="time.time_ns is present only on 3.7 and above") -+def test_time_ns(): -+ freezer = freeze_time("2012-01-14") -+ local_time = datetime.datetime(2012, 1, 14) -+ utc_time = local_time - datetime.timedelta(seconds=time.timezone) -+ expected_timestamp = time.mktime(utc_time.timetuple()) -+ -+ freezer.start() -+ assert time.time() == expected_timestamp -+ assert time.time_ns() == expected_timestamp * 1e9 -+ freezer.stop() -+ assert time.time() != expected_timestamp diff --git a/dev-python/freezegun/files/freezegun-0.3.12-tests.patch b/dev-python/freezegun/files/freezegun-0.3.12-tests.patch deleted file mode 100644 index 08543fc7d59..00000000000 --- a/dev-python/freezegun/files/freezegun-0.3.12-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/test_datetimes.py b/tests/test_datetimes.py -index 688fdce..a61484d 100644 ---- a/tests/test_datetimes.py -+++ b/tests/test_datetimes.py -@@ -18,7 +18,7 @@ except ImportError: - maya = None - - # time.clock was removed in Python 3.8 --HAS_CLOCK = hasattr(time, 'clock') -+HAS_CLOCK = hasattr(time, 'clock') and getattr(time, 'clock') is not None - HAS_TIME_NS = hasattr(time, 'time_ns') - - class temp_locale(object): diff --git a/dev-python/freezegun/freezegun-0.3.12-r1.ebuild b/dev-python/freezegun/freezegun-0.3.12-r1.ebuild deleted file mode 100644 index 05c8f8311e2..00000000000 --- a/dev-python/freezegun/freezegun-0.3.12-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Let your Python tests travel through time" -HOMEPAGE="https://github.com/spulec/freezegun"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="test" - -RDEPEND=" - >dev-python/python-dateutil-2.0[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - $(python_gen_impl_dep sqlite) - dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - # pulled from upstream git, will be in next release - "${FILESDIR}/freezegun-0.3.12-py38.patch" - - # test fixes - "${FILESDIR}/freezegun-0.3.12-tests.patch" -) - -distutils_enable_tests pytest - -python_prepare_all() { - sed -r \ - -e 's:(python-dateutil)>=2.0:\1:' \ - -e "s:'(python-dateutil)>=[0-9.]+,.+':'\1':" \ - -i setup.py - - distutils-r1_python_prepare_all -} - -python_prepare() { - # optional and only works with python3 - if ! python_is_python3; then - rm ${PN}/_async.py || die - fi -}
