diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:18:26 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:18:26 +0100 |
commit | 6c30cc2d5bd48ddbdbe8d75544899cd5dbfcaba4 (patch) | |
tree | 6ef7f6e1d48141a5da904d788b906da5bba4b697 /dev-python/freezegun | |
parent | 62f82c107c3904ac6917ece47301d2999c7dd90e (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-python/freezegun')
-rw-r--r-- | dev-python/freezegun/Manifest | 3 | ||||
-rw-r--r-- | dev-python/freezegun/files/freezegun-0.3.10-py37.patch | 58 | ||||
-rw-r--r-- | dev-python/freezegun/freezegun-0.3.10.ebuild | 6 |
3 files changed, 65 insertions, 2 deletions
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest index c87695d45b97..11fde6bda583 100644 --- a/dev-python/freezegun/Manifest +++ b/dev-python/freezegun/Manifest @@ -1,5 +1,6 @@ +AUX freezegun-0.3.10-py37.patch 2157 BLAKE2B 9d7815473f512a36431872664aae95d9aba815380ec08ed6bd54d764a3e65347c9214fbc7ede39b94964105f8fca2a3127e1eddb9b4385d30788b3bceb2f975d SHA512 1664ce2e1947a6b9b37beb3191ab83f3e7e257f500aa512c0d0d085af34b150fb964b18875faba976f0d094b80681e778a7b06b5251eaa1e811cfb2eaf9a2fb3 DIST freezegun-0.3.10.tar.gz 20398 BLAKE2B 971f4f3de565878b8a1e4671160f41cc7c558f5c848f5c79dfc48e3f3e3cb71ff9c71090705167d4252edbfee040ef52a7eafd33073011c07337311a7e0ec366 SHA512 64364459dc72484e2124a20a0a84d2b88617efd0578fba687adb51635d578a1e36a00cb119998082610c608e7b6c3589bff5424e38845bad026e85449c8065a5 DIST freezegun-0.3.9.tar.gz 18118 BLAKE2B 7382646acf0ca8100680cd44d22de3263541031686e05f7957023eaf22f2a1dea370c98f8b6af89a5075aa5636c304e6e7d5a1c64285aa221a73c732bfc5e0c6 SHA512 1aba8ffacc8b9ebdf810253181418bacb75c04222dc59a5e1e526a9f2d97573944926b1b9fcb6c6e6971a7958acaf9b7522c5582190ae6be448c043b6f908c17 -EBUILD freezegun-0.3.10.ebuild 899 BLAKE2B fe73a9d9e4cb1c3201b5e576d8bd86d48b0835fddb0f6860a99858d81921fd2ad772719913f6b2259b11cd194b1577b576f118c2fdefbe38ffb57c8f6963da2a SHA512 2a1abb145a5a8286e612b5ef722f2a25a7df4bc784c1bbd02f26d3ac31be169cd7a13ead297748208d2c31aa9939985b0f37659ffa482b61fffa267e4e4200af +EBUILD freezegun-0.3.10.ebuild 954 BLAKE2B fed2e0e3ec65a6382dd8c579a17985d288d6a13b616a391f625a2c02a667633de2a518cab065d0642adaf85f003ade68baf55b682114699fc8e4029b25e02018 SHA512 5ec546e3cf035c0407dd0e046c877edbbf6d69bcf7c41f32244186ff8d202e1c8ba3fca091c51464e682ad30dc941a239346f3f260e02ebd00e111f1e137ec29 EBUILD freezegun-0.3.9.ebuild 654 BLAKE2B a48e34dd3278053d7eb42f73e0e6c226f2c28d0075dfd7457bae59a6913631b0389334eaa1ccfef4535ffca72f3370f0a255f362a26c54c9f19ce37317384f30 SHA512 0060d7b5a703225eae1dc91cf3d5568cbb48926e1f60bc7ee4ae9936a62a7286f974d9887b91af19cc3269779ab9e68a334ab6208f239e5aebf9342a75c47510 MISC metadata.xml 392 BLAKE2B 574f859b6be3de78801f9214b561b366ddb87357be71a6891084da1f3de2e6481692d5da7ca6d5008d3ae963cc1e36ead4aae6115f0008d63d65a089cf70115f SHA512 b39f8a45d62f0c220fb915ad64c6a17e9f9619aa8c358694c3a3a83464eb5fcf50ed658430d9aabfb76e8310d4ab3baf059a8de78ebe46a59d6af187735489ed diff --git a/dev-python/freezegun/files/freezegun-0.3.10-py37.patch b/dev-python/freezegun/files/freezegun-0.3.10-py37.patch new file mode 100644 index 000000000000..aa3bd536e09e --- /dev/null +++ b/dev-python/freezegun/files/freezegun-0.3.10-py37.patch @@ -0,0 +1,58 @@ +From 4fdad69659f15a9e62cf4f6c15c9f319276cf9b0 Mon Sep 17 00:00:00 2001 +From: Jonas Obrist <jonas.obrist@hde.co.jp> +Date: Tue, 6 Mar 2018 12:21:38 +0900 +Subject: [PATCH] add support for Python 3.7 uuid module changes + +Python 3.7 removed uuid._uuid_generate_time. It now has +uuid._load_system_functions and uuid._generate_time_safe. +_generate_time_safe is set by calling _load_system_functions (subsequent +calls to that function are no-op). This change detects the missing +uuid._uuid_generate_time attribute and uses the new attribute/function +if they're missing. +--- + freezegun/api.py | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/freezegun/api.py b/freezegun/api.py +index eb09932..a88a392 100644 +--- a/freezegun/api.py ++++ b/freezegun/api.py +@@ -27,8 +27,14 @@ _real_time_object_ids = set(id(obj) for obj in real_date_objects) + + try: + real_uuid_generate_time = uuid._uuid_generate_time +-except (AttributeError, ImportError): ++ uuid_generate_time_attr = '_uuid_generate_time' ++except AttributeError: ++ uuid._load_system_functions() ++ real_uuid_generate_time = uuid._generate_time_safe ++ uuid_generate_time_attr = '_generate_time_safe' ++except ImportError: + real_uuid_generate_time = None ++ uuid_generate_time_attr = None + + try: + real_uuid_create = uuid._UuidCreate +@@ -482,7 +488,8 @@ class _freeze_time(object): + time.localtime = fake_localtime + time.gmtime = fake_gmtime + time.strftime = fake_strftime +- uuid._uuid_generate_time = None ++ if uuid_generate_time_attr: ++ setattr(uuid, uuid_generate_time_attr, None) + uuid._UuidCreate = None + uuid._last_timestamp = None + +@@ -573,7 +580,8 @@ class _freeze_time(object): + time.localtime = time.localtime.previous_localtime_function + time.strftime = time.strftime.previous_strftime_function + +- uuid._uuid_generate_time = real_uuid_generate_time ++ if uuid_generate_time_attr: ++ setattr(uuid, uuid_generate_time_attr, real_uuid_generate_time) + uuid._UuidCreate = real_uuid_create + uuid._last_timestamp = None + +-- +2.18.0 + diff --git a/dev-python/freezegun/freezegun-0.3.10.ebuild b/dev-python/freezegun/freezegun-0.3.10.ebuild index f604d233c5f2..0fbdf8bec99f 100644 --- a/dev-python/freezegun/freezegun-0.3.10.ebuild +++ b/dev-python/freezegun/freezegun-0.3.10.ebuild @@ -12,7 +12,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="test" RDEPEND=" @@ -28,6 +28,10 @@ DEPEND="${RDEPEND} ) " +PATCHES=( + "${FILESDIR}"/freezegun-0.3.10-py37.patch +) + python_test() { nosetests -v || die "Tests fail with ${EPYTHON}" } |