[arch-commits] Commit in yq/trunk (2 files)

[Felix Yan]

    Date: Monday, May 25, 2020 @ 14:24:15
  Author: felixonmars
Revision: 634396

upgpkg: yq 2.10.1-1

Modified:
  yq/trunk/PKGBUILD
Deleted:
  yq/trunk/0001-Fix-test_datestimes-for-PyYAML-5.3.patch

-----------------------------------------------+
 0001-Fix-test_datestimes-for-PyYAML-5.3.patch |   37 ------------------------
 PKGBUILD                                      |   13 +-------
 2 files changed, 3 insertions(+), 47 deletions(-)

Deleted: 0001-Fix-test_datestimes-for-PyYAML-5.3.patch
===================================================================
--- 0001-Fix-test_datestimes-for-PyYAML-5.3.patch	2020-05-25 14:19:58 UTC (rev 634395)
+++ 0001-Fix-test_datestimes-for-PyYAML-5.3.patch	2020-05-25 14:24:15 UTC (rev 634396)
@@ -1,37 +0,0 @@
-From 57b9698ce56a78c783b5535910e2db81c0cc9e2c Mon Sep 17 00:00:00 2001
-From: "Daniel M. Capella" <polyzen at archlinux.org>
-Date: Sat, 29 Feb 2020 16:10:50 -0500
-Subject: [PATCH] Fix test_datestimes for PyYAML >=5.3
-
----
- test/test.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/test/test.py b/test/test.py
-index 12fa806..8897196 100755
---- a/test/test.py
-+++ b/test/test.py
-@@ -3,7 +3,7 @@
- 
- from __future__ import absolute_import, division, print_function, unicode_literals
- 
--import os, sys, unittest, tempfile, json, io, platform, subprocess
-+import os, sys, unittest, tempfile, json, io, platform, subprocess, yaml
- 
- sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
- from yq import yq, cli  # noqa
-@@ -116,7 +116,10 @@ class TestYq(unittest.TestCase):
- 
-     def test_datetimes(self):
-         self.assertEqual(self.run_yq("- 2016-12-20T22:07:36Z\n", ["."]), "")
--        self.assertEqual(self.run_yq("- 2016-12-20T22:07:36Z\n", ["-y", "."]), "- '2016-12-20T22:07:36'\n")
-+        if yaml.__version__ < '5.3':
-+            self.assertEqual(self.run_yq("- 2016-12-20T22:07:36Z\n", ["-y", "."]), "- '2016-12-20T22:07:36'\n")
-+        else:
-+            self.assertEqual(self.run_yq("- 2016-12-20T22:07:36Z\n", ["-y", "."]), "- '2016-12-20T22:07:36+00:00'\n")
- 
-         self.assertEqual(self.run_yq("2016-12-20", ["."]), "")
-         self.assertEqual(self.run_yq("2016-12-20", ["-y", "."]), "'2016-12-20'\n")
--- 
-2.25.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-25 14:19:58 UTC (rev 634395)
+++ PKGBUILD	2020-05-25 14:24:15 UTC (rev 634396)
@@ -2,7 +2,7 @@
 # Contributor: Caleb Maclennan <caleb at alerque.com>
 
 pkgname=yq
-pkgver=2.10.0
+pkgver=2.10.1
 pkgrel=1
 pkgdesc="Command-line YAML/XML processor - jq wrapper for YAML/XML documents"
 url="https://github.com/kislyuk/yq"
@@ -12,16 +12,9 @@
 optdepends=('python-toml')
 license=('Apache')
 arch=('any')
-source=("https://files.pythonhosted.org/packages/source/y/$pkgname/$pkgname-$pkgver.tar.gz"
-        0001-Fix-test_datestimes-for-PyYAML-5.3.patch)
-sha256sums=('abaf2c0728f1c38dee852e976b0a6def5ab660d67430ee5af76b7a37072eba46'
-            '4323f882c110ad4936892e295e634785086839b97730d74f924bc98e547a66cb')
+source=("https://files.pythonhosted.org/packages/source/y/$pkgname/$pkgname-$pkgver.tar.gz")
+sha512sums=('7fd38d454a924810117b7b87e519b4e91be654631827f806a95723ca04218fe3a7ece84a5a88787fe4b2d9acd60da74d6a7131950724f339b4e1bf3d0e35c792')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch --forward --strip=1 --input=../0001-Fix-test_datestimes-for-PyYAML-5.3.patch
-}
-
 build() {
   cd $pkgname-$pkgver
   python setup.py build