diff --git a/.gitignore b/.gitignore index cf98d48..0aadde3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ Mayavi-3.3.2.tar.gz /mayavi-4.7.1.tar.gz /mayavi-4.7.2.tar.gz /mayavi-4.7.3.tar.gz +/mayavi-4.7.4.tar.gz diff --git a/0823fd8fdb15a728be1bba44980fb4d1a3efb90f.patch b/0823fd8fdb15a728be1bba44980fb4d1a3efb90f.patch deleted file mode 100644 index 29b2c95..0000000 --- a/0823fd8fdb15a728be1bba44980fb4d1a3efb90f.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0823fd8fdb15a728be1bba44980fb4d1a3efb90f Mon Sep 17 00:00:00 2001 -From: Poruri Sai Rahul -Date: Mon, 10 May 2021 05:00:46 +0000 -Subject: [PATCH] FIX : Update use of Callable from collections std lib package - (#1022) - -importing it from collections was deprecated and the import was removed -in python 3.10. -it needs to be imported from collections.abc now - - modified: tvtk/vtk_parser.py ---- - tvtk/vtk_parser.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tvtk/vtk_parser.py b/tvtk/vtk_parser.py -index 447dfeff..484ffa20 100644 ---- a/tvtk/vtk_parser.py -+++ b/tvtk/vtk_parser.py -@@ -8,7 +8,7 @@ - - from __future__ import print_function - --import collections -+import collections.abc - import re - import types - -@@ -475,7 +475,7 @@ def _organize_methods(self, klass, methods): - meths = self._find_get_methods(klass, meths) - self.other_meths = [ - x for x in meths \ -- if isinstance(getattr(klass, x), collections.Callable) -+ if isinstance(getattr(klass, x), collections.abc.Callable) - ] - - def _remove_method(self, meths, method): diff --git a/1050.patch b/1050.patch deleted file mode 100644 index 787aa48..0000000 --- a/1050.patch +++ /dev/null @@ -1,52 +0,0 @@ -From fb441187bbd5c904e84ed21b20fe0dbacb5cf448 Mon Sep 17 00:00:00 2001 -From: Eric Larson -Date: Wed, 16 Jun 2021 10:33:19 -0400 -Subject: [PATCH] WIP: Update for latest VTK - ---- - tvtk/vtk_parser.py | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/tvtk/vtk_parser.py b/tvtk/vtk_parser.py -index ad9c77b5..f967e06e 100644 ---- a/tvtk/vtk_parser.py -+++ b/tvtk/vtk_parser.py -@@ -632,6 +632,9 @@ def _find_get_set_methods(self, klass, methods): - elif (klass_name == 'vtkPiecewisePointHandleItem' and - method[3:] == 'PiecewiseFunction'): - continue -+ # These hang on Windows (and maybe Fedora 34) -+ elif (klass_name in ('vtkDataEncoder', 'vtkWebApplication')): -+ continue - # we can actually process it - elif ('Get' + method[3:]) in methods: - key = method[3:] -@@ -646,7 +649,10 @@ def _find_get_set_methods(self, klass, methods): - - # Find the default and range of the values. - if gsm: -+ # Useful for debugging on failures: -+ # print('get instance', klass) - obj = self._get_instance(klass) -+ # print('got instance', obj.__class__) - if obj: - for key, value in gsm.items(): - if not is_version_9() and ( -@@ -679,7 +685,7 @@ def _find_get_set_methods(self, klass, methods): - else: - try: - # Useful for debugging on failures: -- # print(klass_name, key) -+ # print('Get', klass_name, key) - default = getattr(obj, 'Get%s' % key)() - except TypeError: - default = None -@@ -694,7 +700,7 @@ def _find_get_set_methods(self, klass, methods): - # Segfaults can be exposed by uncommenting these lines, - # leave them commented while running because they - # slow things down quite a bit -- # print(klass_name) -+ # print('GC', klass_name) - # import gc - # gc.collect() - else: diff --git a/Mayavi.spec b/Mayavi.spec index b451540..445f9d0 100644 --- a/Mayavi.spec +++ b/Mayavi.spec @@ -1,14 +1,13 @@ +#global commit 8e64b2643b98bc0803cd3ff90e0203b0edf7200f + Name: Mayavi -Version: 4.7.3 -Release: 3%{?dist} +Version: 4.7.4 +Release: 1%{?dist} Summary: Scientific data 3-dimensional visualizer License: BSD and EPL and LGPLv2+ and LGPLv2 and LGPLv3 URL: http://code.enthought.com/projects/mayavi/ Source0: https://github.com/enthought/mayavi/archive/%{version}/mayavi-%{version}.tar.gz Source1: mayavi2.desktop -# Fix hang in tests -Patch0: https://patch-diff.githubusercontent.com/raw/enthought/mayavi/pull/1050.patch -Patch1: https://github.com/enthought/mayavi/commit/0823fd8fdb15a728be1bba44980fb4d1a3efb90f.patch BuildRequires: gcc BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-Cython @@ -163,6 +162,9 @@ PYTHONPATH=${libdir} mayavi/scripts/mayavi2 -t || : %changelog +* Mon Nov 15 2021 Orion Poplawski - 4.7.4-1 +- Update to 4.7.4 + * Mon Jul 26 2021 David - 4.7.3-3 - Fix FTBFS diff --git a/sources b/sources index 3ed19fd..49bae35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mayavi-4.7.3.tar.gz) = 27ddbacda5076a8df371b6f0b4e94960f21cb65b204ab1064654ba8a77f56e37c58d6530b60b7f3ea7bdd6775b87d358824bfae27e5aaf223988993be5e0b656 +SHA512 (mayavi-4.7.4.tar.gz) = 2d8577f418d8b8c4a1b90e8d587fe3bc6ba44a2296f96786e6d6d579c55b5573cf376cfae710fe0c0b1b35fb23475bd3c298b38ad5e84d9f1ce1aca21f585b45