From c1afadfc1dc92978b1dda4d72dde25c05231beb5 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Aug 01 2018 12:53:14 +0000
Subject: Update to 1.9.4 (#1577187), fix FTBFS (#1604827)


Uses CPython 3.6 in tests that compare results, due to PEP479

---

diff --git a/.gitignore b/.gitignore
index 6dd977a..0c86e4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 /v1.9.3.tar.gz
 /axtls-dac9176cac58cc5e49669a9a4d404a6f6dd7cc10.tar.gz
 /berkeley-db-1.xx-35aaec4418ad78628a3b935885dd189d41ce779b.tar.gz
+/v1.9.4.tar.gz
+/axtls-43a6e6bd3bbc03dc501e16b89fba0ef042ed3ea0.tar.gz
diff --git a/micropython.spec b/micropython.spec
index a0da7fb..fac62f5 100644
--- a/micropython.spec
+++ b/micropython.spec
@@ -3,8 +3,8 @@
 
 
 Name:           micropython
-Version:        1.9.3
-Release:        6%{?dist}
+Version:        1.9.4
+Release:        1%{?dist}
 Summary:        Implementation of Python 3 with very low memory footprint
 
 # micorpython itself is MIT
@@ -14,7 +14,7 @@ License:        MIT and BSD
 URL:            http://micropython.org/
 Source0:        https://github.com/micropython/micropython/archive/v%{version}.tar.gz
 
-%global axtls_commit dac9176cac58cc5e49669a9a4d404a6f6dd7cc10
+%global axtls_commit 43a6e6bd3bbc03dc501e16b89fba0ef042ed3ea0
 Source1:       https://github.com/pfalcon/axtls/archive/%{axtls_commit}/axtls-%{axtls_commit}.tar.gz
 
 %global berkley_commit 35aaec4418ad78628a3b935885dd189d41ce779b
@@ -30,6 +30,20 @@ BuildRequires:  readline-devel
 BuildRequires:  execstack
 BuildRequires:  openssl-devel
 
+# Part of the tests runs MicroPython and CPython and compares the results.
+# MicroPython is ~3.4.
+# In Python 3.7 however, StopIteration handling in generators changed
+# and the results are no longer comparable.
+# PEP 479: https://www.python.org/dev/peps/pep-0479/
+# Upstream issue: https://github.com/micropython/micropython/issues/4000
+# We use the latest working CPython version in those test, setting the
+# MICROPY_CPYTHON3 environment variable.
+# Normal %%{__pytohn3} is used anywhere else.
+# There is no runtime dependency on this CPython (or any other).
+%global cpython_version_tests 3.6
+BuildRequires:  %{_bindir}/python%{cpython_version_tests}
+
+
 Provides:       bundled(axtls)
 Provides:       bundled(libdb) = 1.85
 
@@ -69,6 +83,7 @@ execstack -c ports/unix/micropython
 
 %check
 pushd ports/unix
+export MICROPY_CPYTHON3=python%{cpython_version_tests}
 make PYTHON=%{__python3} V=1 test
 popd
 
@@ -82,6 +97,10 @@ install -pm 755 ports/unix/micropython %{buildroot}%{_bindir}
 %{_bindir}/micropython
 
 %changelog
+* Wed Aug 01 2018 Miro Hrončok <mhroncok@redhat.com> - 1.9.4-1
+- Update to 1.9.4 (#1577187)
+- Use CPython 3.6 in tests that compare results due to PEP479 (#1604827)
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index f4a6d54..7bd8989 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (v1.9.3.tar.gz) = d276dc9a300e400f5fd5742bfc8c641c0af2d3b7f3ae9221b811100d85e9c2a6c6c558775183c58dd4be39a31284c596c0e98c9bb2c8e60ce4cf0d83434d0a47
-SHA512 (axtls-dac9176cac58cc5e49669a9a4d404a6f6dd7cc10.tar.gz) = b197e06fa6e7282ada9a3ca52b4f999df3aa56ac9ac4369296a7fa9ee20b65fad093965f387d9a577353994da57fb92ded8d2531a6a974ab3784c6535b20d292
+SHA512 (v1.9.4.tar.gz) = aae15ed4251e56261e7ce0db6c86727e62d466e43d3867bb080c21653c0ef3cd25b6ee4b0438fab2ecc838b4b73f7b59ae7a851ad20ef6c38b9eb8667a7dc364
 SHA512 (berkeley-db-1.xx-35aaec4418ad78628a3b935885dd189d41ce779b.tar.gz) = 0d46237be7eb9db2819364405ddb03499c7b371d75cffe5004b1fa7870353a56fc9dc3101f2fd6856760f041f2353844b316dc79cc6b8037ef8188b2f07bff36
+SHA512 (axtls-43a6e6bd3bbc03dc501e16b89fba0ef042ed3ea0.tar.gz) = e6f049cc9966660ffc927c520a82af2e348aca6feadda98f5768102ee14577757e9c70111a345a5480658b5b8f4be51ed2e674ded08d243bc1f82f4107bc36e8