Merge branch 'edge' into next

3 files changed, 72 insertions, 0 deletions

diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 84c45d6ff704..4d8c05861925 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,3 +1,6 @@
+AUX arrow-0.15.5-remove-dateparser.patch 1250 BLAKE2B b9fc76fd97b74f11bb8a9511ff86a046f46dbf942187d64d7937f6b0392fb062eb33463754708fa4f6732a23b19fd61bf1e9dd4987c736e5ade20354e9c2b6ed SHA512 9bc8017bbef9768069c62e760120ce90d79d5ebcee470a4dc8a8fc88754c477779d3a6b0ffa07ca886c0d35b3afd5cafc57bc162d80abf601ba7116db4d10bc1
 DIST arrow-0.13.1.tar.gz 148509 BLAKE2B 7a47f8886cc2f50f6dda682daab37c599aad15c7e4a0c76b1324f9fe3a1b8168e3a2b29352bdc9c4daf0fa3b3843fa919d5256997c673bcb24ca033312242b60 SHA512 4933e02fe4ef7a632d55e5c6d2cbcefe6840467c809e0377be92f02d0dc10b5b2421cea2be7ddd5158236ec80f44848125253bfeef5a2ae635a3b9c5761fa105
+DIST arrow-0.15.5.tar.gz 82264 BLAKE2B 2091e16921a5f9f944de3f25ce853b50973d970d982b880fafa75ee37f98110dde05bfd02bb8ce27518ed17600e5bcfb8602c353d7e3af249aa4bfc4b642356d SHA512 cb147a1f2976e6cedddbf2d2d0d5ce69a4a609d4c0c3d68f96b317fc2af334552cb0c1a94aa5bb38e6d74ca7e1beab1ae8a325920a15efd79c35835c92df2409
 EBUILD arrow-0.13.1.ebuild 732 BLAKE2B f41fddc75737387efa31433f3d923a028a74a938b8e5ec5414b9d298df8f6326a31c4af9d3ea313bc6c885e23862fc929b4b3f290b2771210e495075eea3c87b SHA512 79bd09eee7f07b0893b444200cda484a63e4b65053a07b76f9de117d32ef8937ec24614f10d1c115fc4f74d2a6dad768072c9fbdbd641f4a997f7c071a629f39
+EBUILD arrow-0.15.5.ebuild 636 BLAKE2B 01c376ad401e0f8783e241811dc9024449de4d97a599418e72667fe3f78c5a8916299bbc70fa2d9f62fd63ca0826c66a14678c395b8d140d86396592ad5a0ce4 SHA512 691638ffe05601a57755627e70e275b494942b0756030d7e541680273de64717b60bb20816fbd70d8ce02d728df33c90c9f4f115f906beeee2f0bd43283918db
 MISC metadata.xml 364 BLAKE2B c9cf1b8e27d0ae03d522628edffd052df05f37a857d671df00ec0f2868c598ba983b32b66a98c0f4ff814f8fb5fcad8482592852c38384c7eb99bb71f0ac8b32 SHA512 4288f06ad48ba051749472da3ff12ab53d50226c053764c9c175ac13a24b8817c731350ae153ef83ee02db04aa6ba7735cb30b8e35339badc0e46b6998773015
diff --git a/dev-python/arrow/arrow-0.15.5.ebuild b/dev-python/arrow/arrow-0.15.5.ebuild
new file mode 100644
index 000000000000..2c705f6d9bde
--- /dev/null
+++ b/dev-python/arrow/arrow-0.15.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Better dates and times for Python"
+HOMEPAGE="https://github.com/crsmithdev/arrow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/chai[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests setup.py
+
+PATCHES=(
+	"${FILESDIR}"/arrow-0.15.5-remove-dateparser.patch
+)
diff --git a/dev-python/arrow/files/arrow-0.15.5-remove-dateparser.patch b/dev-python/arrow/files/arrow-0.15.5-remove-dateparser.patch
new file mode 100644
index 000000000000..ea3b7847964b
--- /dev/null
+++ b/dev-python/arrow/files/arrow-0.15.5-remove-dateparser.patch
@@ -0,0 +1,39 @@
+From 00b34547e99259eda92d7bd1ca406e74693d6861 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 19 Apr 2020 18:30:20 +0200
+Subject: [PATCH] Remove test requiring dateparser
+
+---
+ tests/factory_tests.py | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/tests/factory_tests.py b/tests/factory_tests.py
+index abdd0d0..65fa1bb 100644
+--- a/tests/factory_tests.py
++++ b/tests/factory_tests.py
+@@ -2,7 +2,6 @@
+ import time
+ from datetime import date, datetime
+ 
+-import dateparser
+ from chai import Chai
+ from dateutil import tz
+ 
+@@ -113,14 +112,6 @@ class GetTests(Chai):
+ 
+         assertDtEqual(self.factory.get(tz.gettz("US/Pacific")), self.expected)
+ 
+-    # regression test for issue #658
+-    def test_one_arg_dateparser_datetime(self):
+-        expected = datetime(1990, 1, 1).replace(tzinfo=tz.tzutc())
+-        # dateparser outputs: datetime.datetime(1990, 1, 1, 0, 0, tzinfo=<StaticTzInfo 'UTC\+00:00'>)
+-        parsed_date = dateparser.parse("1990-01-01T00:00:00+00:00")
+-        dt_output = self.factory.get(parsed_date)._datetime.replace(tzinfo=tz.tzutc())
+-        self.assertEqual(dt_output, expected)
+-
+     def test_kwarg_tzinfo(self):
+ 
+         self.expected = (
+-- 
+2.26.1
+