diff --git a/8b3d0ccc2381919c8de944caa6485eb88d13e819.patch b/8b3d0ccc2381919c8de944caa6485eb88d13e819.patch new file mode 100644 index 0000000..3758fdb --- /dev/null +++ b/8b3d0ccc2381919c8de944caa6485eb88d13e819.patch @@ -0,0 +1,23 @@ +From 8b3d0ccc2381919c8de944caa6485eb88d13e819 Mon Sep 17 00:00:00 2001 +From: Thomas Robitaille +Date: Thu, 6 Jun 2019 09:49:48 +0200 +Subject: [PATCH] Fix import from collections + +--- + astropy/utils/timer.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/astropy/utils/timer.py b/astropy/utils/timer.py +index 30519b9f681..c9d0bacdb5f 100644 +--- a/astropy/utils/timer.py ++++ b/astropy/utils/timer.py +@@ -4,7 +4,8 @@ + # STDLIB + import time + import warnings +-from collections import Iterable, OrderedDict ++from collections import OrderedDict ++from collections.abc import Iterable + from functools import partial, wraps + + # THIRD-PARTY diff --git a/python-astropy.spec b/python-astropy.spec index 0d4a54a..1cba08a 100644 --- a/python-astropy.spec +++ b/python-astropy.spec @@ -26,6 +26,8 @@ Patch1: python-astropy-system-six.patch # https://github.com/astropy/astropy/pull/8500 Patch2: python-astropy-fix-pyyaml5-8500.patch +Patch3: https://github.com/astropy/astropy/commit/8b3d0ccc2381919c8de944caa6485eb88d13e819.patch + BuildRequires: gcc BuildRequires: git BuildRequires: cfitsio-devel @@ -142,6 +144,8 @@ cp %{SOURCE2} astropy/extern/ply.py # Fix for PyYAML 5.x %patch2 -p1 +%patch3 -p1 + # Force Cython re-run echo "cython_version = 'unknown'" > astropy/cython_version.py