From c44d68ea78b7f13b6a2d4d9909df465e96fcf8cc Mon Sep 17 00:00:00 2001 From: Jerry James Date: Feb 04 2020 16:45:11 +0000 Subject: Add -ordered-dict patch, thanks to Miro Hrončok (bz 1797982). --- diff --git a/python-theano-ordered-dict.patch b/python-theano-ordered-dict.patch new file mode 100644 index 0000000..e687405 --- /dev/null +++ b/python-theano-ordered-dict.patch @@ -0,0 +1,22 @@ +--- theano/compat/__init__.py.orig 2019-01-15 14:13:57.000000000 -0700 ++++ theano/compat/__init__.py 2020-02-04 09:26:16.603940786 -0700 +@@ -6,15 +6,14 @@ from __future__ import absolute_import, + from six import PY3, b, BytesIO, next + from six.moves import configparser + from six.moves import reload_module as reload ++from collections import OrderedDict + try: +- from collections.abc import (OrderedDict, MutableMapping as DictMixin, +- Callable) ++ from collections.abc import MutableMapping as DictMixin, Callable + except ImportError: + # this raises an DeprecationWarning on py37 and will become +- # and Exception in py38. Importing from collections.abc ++ # an Exception in py39. Importing from collections.abc + # won't work on py27 +- from collections import (OrderedDict, MutableMapping as DictMixin, +- Callable) ++ from collections import MutableMapping as DictMixin, Callable + + __all__ = ['PY3', 'b', 'BytesIO', 'next', 'configparser', 'reload'] + diff --git a/python-theano.spec b/python-theano.spec index 7284d07..3e53f45 100644 --- a/python-theano.spec +++ b/python-theano.spec @@ -7,7 +7,7 @@ Name: python-theano Version: 1.0.4 -Release: 5%{?rctag:.%{rctag}}%{?dist}.1 +Release: 6%{?rctag:.%{rctag}}%{?dist} Summary: Mathematical expressions involving multidimensional arrays License: BSD @@ -57,6 +57,9 @@ Patch13: %{name}-is.patch Patch14: %{name}-doc.patch # Scipy 1.3.x produces sorted indices, so do not assert they are unsorted Patch15: %{name}-has-sorted-indices.patch +# Fix the import of OrderedDict +# https://github.com/Theano/Theano/pull/6741 +Patch16: %{name}-ordered-dict.patch BuildArch: noarch @@ -200,6 +203,9 @@ rm theano/tensor/nnet/tests/test_corr3d.py %doc html %changelog +* Tue Feb 4 2020 Jerry James - 1.0.4-6 +- Add -ordered-dict patch, thanks to Miro Hrončok (bz 1797982) + * Thu Jan 30 2020 Fedora Release Engineering - 1.0.4-5.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild