[arch-commits] Commit in python-moto/trunk (PKGBUILD cfnlint-0.32.1.diff)

[Chih-Hsuan Yen]

    Date: Friday, May 22, 2020 @ 03:53:02
  Author: yan12125
Revision: 631522

upgpkg: python-moto 1.3.14-2; add a workaround for reproducible .pyc and a patch for the latest cfn-lint

See: https://github.com/spulec/moto/pull/3015

Added:
  python-moto/trunk/cfnlint-0.32.1.diff
Modified:
  python-moto/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   12 ++++++++----
 cfnlint-0.32.1.diff |   21 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-22 03:39:59 UTC (rev 631521)
+++ PKGBUILD	2020-05-22 03:53:02 UTC (rev 631522)
@@ -4,7 +4,7 @@
 pkgname=python-moto
 _pkgname=moto
 pkgver=1.3.14
-pkgrel=1
+pkgrel=2
 pkgdesc='Moto is a library to mock out the boto library.'
 arch=(any)
 url='https://github.com/spulec/moto'
@@ -22,11 +22,13 @@
 source=("https://github.com/spulec/moto/archive/$pkgver/moto-$pkgver.tar.gz"
         $pkgname-regions.patch::https://github.com/spulec/moto/commit/bd777cad44dc0c0ec979c366fce228429d182e2f.patch
         $pkgname-botocore-1.3.21.patch::https://github.com/spulec/moto/commit/4983f6af91c0ef20c997772168f27f988a7ce0e1.patch
-        $pkgname-botocore-1.3.24.patch::https://github.com/spulec/moto/commit/40f241adc212c1c113399534616427d3e2c1d47a.patch)
+        $pkgname-botocore-1.3.24.patch::https://github.com/spulec/moto/commit/40f241adc212c1c113399534616427d3e2c1d47a.patch
+        cfnlint-0.32.1.diff)
 sha256sums=('e10412aa495af0f254d3944fd369e75a7c1bcc2f6940a7ea0a0cea34b2f8bf27'
             'a6020fed84da5c8e7298d3c2750ed33c2b60befe3b9d451432b68d2f030bab93'
             '74fe4c7610ad805e0fde46fb65bba7c5bbdcc52718e592bd04dd0a834734b64e'
-            'cf4ab97f705bfba537e5e5ac33c820c23c42ba0415ed7e2be670ddb42e6683ff')
+            'cf4ab97f705bfba537e5e5ac33c820c23c42ba0415ed7e2be670ddb42e6683ff'
+            'fcee0eb5c76619ac59382e15d8487c859bda63a8091cbc15cf31acb576752444')
 
 prepare() {
   cd $_pkgname-$pkgver
@@ -34,6 +36,7 @@
   patch -Np1 -i ../$pkgname-regions.patch
   patch -Np1 -i ../$pkgname-botocore-1.3.21.patch
   patch -Np1 -i ../$pkgname-botocore-1.3.24.patch
+  patch -Np1 -i ../cfnlint-0.32.1.diff
 
   # Remove upper bounds of dependencies
   sed --in-place=.orig -r 's#,?<[0-9.]+,?##;s#==([0-9.]+)#>=\1#' setup.py
@@ -56,5 +59,6 @@
 package() {
   cd $_pkgname-$pkgver
 
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  # use PYTHONHASHSEED=0 work around https://bugs.python.org/issue34722
+  PYTHONHASHSEED=0 python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }

Added: cfnlint-0.32.1.diff
===================================================================
--- cfnlint-0.32.1.diff	                        (rev 0)
+++ cfnlint-0.32.1.diff	2020-05-22 03:53:02 UTC (rev 631522)
@@ -0,0 +1,21 @@
+diff --git a/tests/test_cloudformation/test_validate.py b/tests/test_cloudformation/test_validate.py
+index 4dd4d7e0..588b3806 100644
+--- a/tests/test_cloudformation/test_validate.py
++++ b/tests/test_cloudformation/test_validate.py
+@@ -65,7 +65,7 @@ def test_boto3_json_invalid_missing_resource():
+         assert (
+             str(e)
+             == "An error occurred (ValidationError) when calling the ValidateTemplate operation: Stack"
+-            " with id Missing top level item Resources to file module does not exist"
++            " with id Missing top level template section Resources does not exist"
+         )
+         assert True
+ 
+@@ -106,6 +106,6 @@ def test_boto3_yaml_invalid_missing_resource():
+         assert (
+             str(e)
+             == "An error occurred (ValidationError) when calling the ValidateTemplate operation: Stack"
+-            " with id Missing top level item Resources to file module does not exist"
++            " with id Missing top level template section Resources does not exist"
+         )
+         assert True