Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mayavi for openSUSE:Factory checked in at 2022-11-24 12:23:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mayavi (Old) and /work/SRC/openSUSE:Factory/.mayavi.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mayavi" Thu Nov 24 12:23:27 2022 rev:6 rq:1037518 version:4.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mayavi/mayavi.changes 2021-11-27 23:42:26.508469788 +0100 +++ /work/SRC/openSUSE:Factory/.mayavi.new.1597/mayavi.changes 2022-11-24 12:23:34.933432132 +0100 @@ -1,0 +2,41 @@ +Tue Nov 22 19:22:02 UTC 2022 - Ben Greiner <[email protected]> + +- Update to 4.8.1 + * This is a bugfix release to work correctly with VTK-9.2.2 and + also resolve pep517 related issues. 3 PRs were merged. + * Add a pyproject.toml. + * BUG: Work around 9.2.2 bug + * Adds a `VTK_PARSER_VERBOSE` env var that can be set to `1` or + `true` to get it to print instantiations/methods as they are + tried. + * Adds a `TVTK_VERBOSE` env var that enables printing during the + TVTK tests (which were segfaulting at one point). + * Update protein.py to work correctly. +- Mayavi 4.8.0 + * This release introduces a few useful new features and fixes + some bugs. The primary feature is the addition of support for + an itkwidgets_ backend for jupyter notebook support using + entirely client-side rendering. This version also makes it + possible to build and install Mayavi on headless servers. + ## Enhancements + * Refactor jupyter backends and add support for using + itkwidgets_. This allows us to use Mayavi in a headless manner + unlike the other backends which require offscreen support. + * Also issues with the test backend which is used for the new + ``'itk'`` backend. + ## Fixes + * Support VTK_LONG_LONG and VTK_UNSIGNED_LONG_LONG array handler. + * Fix bug with cell_to_point_data filter. + * Fix headless build + - Ensure that tests can run when toolkit is null. + - Do not generate docs on build as this will fail on headless + servers. + * Use raw strings for generated docstrings +- No X server for install anymore +- Remove doc packages +- Remove examples and integrationtests from installed sitearch +- Enable (headless, 64bit-only) test suite with pytest +- Merge python3-tvtk into main package. It does not have its own + metadata and is not on PyPI. + +------------------------------------------------------------------- Old: ---- mayavi-4.7.4.tar.gz New: ---- mayavi-4.8.1.tar.gz mayavi-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mayavi.spec ++++++ --- /var/tmp/diff_new_pack.bG0XGr/_old 2022-11-24 12:23:35.837437876 +0100 +++ /var/tmp/diff_new_pack.bG0XGr/_new 2022-11-24 12:23:35.837437876 +0100 @@ -1,7 +1,7 @@ # # spec file for package mayavi # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,10 @@ # -%define X_display ":98" # vtk only for python3 flavor %define pythons python3 Name: mayavi -Version: 4.7.4 +Version: 4.8.1 Release: 0 Summary: 3D visualization of scientific data in Python License: BSD-3-Clause AND EPL-1.0 AND LGPL-2.0-or-later AND LGPL-3.0-or-later @@ -29,36 +28,40 @@ Source0: https://files.pythonhosted.org/packages/source/m/mayavi/mayavi-%{version}.tar.gz Source1: mayavi.desktop Source2: tvtk_doc.desktop -BuildRequires: R-base-devel +Source99: mayavi-rpmlintrc BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: python-rpm-macros -BuildRequires: python3-Cython BuildRequires: python3-Pygments -BuildRequires: python3-Sphinx BuildRequires: python3-apptools -BuildRequires: python3-configobj -BuildRequires: python3-devel -BuildRequires: python3-envisage >= 3.0 -BuildRequires: python3-numpy-devel >= 1.0.1 +BuildRequires: python3-devel >= 3.7 +BuildRequires: python3-envisage +BuildRequires: python3-numpy-devel +BuildRequires: python3-packaging +BuildRequires: python3-pip BuildRequires: python3-pyface >= 6.1.1 -BuildRequires: python3-qt5 +BuildRequires: python3-pytest BuildRequires: python3-setuptools BuildRequires: python3-traits >= 6.0.0 BuildRequires: python3-traitsui >= 7.0.0 -BuildRequires: python3-vtk >= 5.0 +BuildRequires: python3-vtk +BuildRequires: python3-wheel BuildRequires: update-desktop-files BuildRequires: vtk-devel +# see mayavi/__init__.py Requires: python3-Pygments Requires: python3-apptools Requires: python3-envisage -Requires: python3-qt5 -Requires: python3-tvtk = %{version} +Requires: python3-packaging +Requires: python3-pyface >= 6.1.1 +Requires: python3-traits >= 6.0.0 +Requires: python3-traitsui >= 7.0.0 +Requires: python3-vtk +Recommends: python3-qt5 +Provides: python3-tvtk = %{version} +Obsoletes: python3-tvtk < 4.8.1 Provides: python3-mayavi = %{version} Recommends: %{name}-jupyter -# SECTION test requirements -BuildRequires: xorg-x11-server -# /SECTION %description Mayavi provides interactive visualization of 3-D data. It offers: @@ -77,44 +80,6 @@ It is part of the Enthought Tool Suite (ETS). -%package -n python3-tvtk -Summary: A python3-traits enabled version of python3-vtk -Group: Productivity/Scientific/Other -Requires: python3-numpy -Requires: python3-pyface >= 6.1.1 -Requires: python3-traits >= 6.0.0 -Requires: python3-traitsui >= 7.0.0 -Requires: python3-vtk -Recommends: python3-configobj -Recommends: python3-envisage >= 3.0 -Recommends: python3-wxWidgets >= 2.8 - -%description -n python3-tvtk -TVTK wraps VTK objects to provide a convenient, Pythonic API, while -supporting Traits attributes and NumPy/SciPy arrays. TVTK is -implemented mostly in pure Python, except for a small extension module. - -Developers typically use TVTK to write Mayavi modules, and then use -Mayavi to interact with visualizations or create applications. - -It is part of the Enthought Tool Suite (ETS). - -%package doc -Summary: Documentation for mayavi -Group: Documentation/HTML -Requires: %{name} = %{version} - -%description doc -Documentation files for the %{name} package. - -%package -n python3-tvtk-doc -Summary: Documentation for python3-tvtk -Group: Documentation/HTML -Requires: python3-tvtk = %{version} - -%description -n python3-tvtk-doc -Documentation files for the python3-tvtk package. - %package jupyter Summary: Jupyter notebook backend for mayavi Group: Productivity/Scientific/Other @@ -122,6 +87,7 @@ Requires: jupyter-ipyevents Requires: jupyter-ipywidgets Requires: jupyter-notebook +BuildArch: noarch %description jupyter Interface to allow plotting with mayavi in Jupyter @@ -132,7 +98,6 @@ %prep %setup -q -n mayavi-%{version} -rm -r mayavi.egg-info # wrong-file-end-of-line-encoding sed -i 's|\r||' examples/mayavi/data/room_vis.wrl @@ -143,50 +108,19 @@ # non-executable-script sed -i -e '/^#!\//, 1d' integrationtests/mayavi/*.py sed -i -e '/^#!\//, 1d' mayavi/tests/*.py -sed -i -e '/^#!\//, 1d' mayavi/tests/csv_files/csv_2_py sed -i -e '/^#!\//, 1d' mayavi/scripts/*.py sed -i -e '/^#!\//, 1d' tvtk/setup.py # env-script-interpreter -find . -name \*.py -exec \ - sed -i -e '1s@#!\s*%{_bindir}/env\s*python@#!%{_bindir}/python@' '{}' \; +find . -name \*py -exec \ + sed -i -e '1s@#!\s*%{_bindir}/env\s*python@#!%{__python3}@' '{}' \; %build -export LANG=en_US.UTF-8 -export DISPLAY=%{X_display} -Xvfb %{X_display} >& Xvfb.log & -trap "kill $! || true" EXIT -sleep 10 - export CFLAGS="%{optflags}" -%python3_build +%python3_pyproject_wheel %install -export LANG=en_US.UTF-8 -export DISPLAY=%{X_display} -Xvfb %{X_display} >& Xvfb.log & -trap "kill $! || true" EXIT -sleep 10 - -%python3_install - -# examples and integrationtests are not installed by the build system -# Manually install examples and integrationtests in python3_sitearch -mkdir -p %{buildroot}%{python3_sitearch}/mayavi/examples -cp -R examples/mayavi/* %{buildroot}%{python3_sitearch}/mayavi/examples/ -mkdir -p %{buildroot}%{python3_sitearch}/mayavi/integrationtests -cp -R integrationtests/mayavi/* %{buildroot}%{python3_sitearch}/mayavi/integrationtests/ -mkdir -p %{buildroot}%{python3_sitearch}/tvtk/examples -cp -R examples/tvtk/* %{buildroot}%{python3_sitearch}/tvtk/examples/ - -# Remove shebang from .py files in examples and integrationtests -# as they are not supposed to be executed -find %{buildroot}%{python3_sitearch}/{mayavi,tvtk}/examples -name \*.py \ - -exec sed -i -e '/^#!\//, 1d' '{}' \; -%if 0%{?suse_version} > 1320 -find %{buildroot}%{python3_sitearch}/mayavi/html/_downloads -name \*.py \ - -exec sed -i -e '/^#!\//, 1d' '{}' \; -%endif +%python3_pyproject_install mkdir -p %{buildroot}/%{_mandir}/man1/ mv docs/mayavi2.man %{buildroot}/%{_mandir}/man1/mayavi2.1 @@ -196,67 +130,35 @@ install -p -m 644 ./docs/source/mayavi/images/mayavi2-48x48.png \ %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/tvtk_doc.png -chmod a+x %{buildroot}%{python3_sitearch}/mayavi/scripts/mayavi2.py -chmod a+x %{buildroot}%{python3_sitearch}/mayavi/tests/runtests.py -chmod a+x %{buildroot}%{python3_sitearch}/tvtk/setup.py - -# script-without-shebang -chmod a-x %{buildroot}%{python3_sitearch}/mayavi/scripts/mayavi2.py -chmod a-x %{buildroot}%{python3_sitearch}/mayavi/tests/csv_files/csv_2_py -chmod a-x %{buildroot}%{python3_sitearch}/mayavi/tests/runtests.py -chmod a-x %{buildroot}%{python3_sitearch}/tvtk/setup.py - %suse_update_desktop_file -i mayavi %suse_update_desktop_file -i tvtk_doc -mkdir -p %{buildroot}%{_docdir}/mayavi/ -mkdir -p %{buildroot}%{_docdir}/python3-tvtk/ -cp -r docs/build/mayavi/html %{buildroot}%{_docdir}/mayavi/ -cp -r docs/build/tvtk/html %{buildroot}%{_docdir}/python3-tvtk/ - -# Use Unix Line endings -sed -i "s|\r||g" %{buildroot}%{_docdir}/python3-tvtk/html/objects.inv - -# REMOVE UNNEEDED HIDDEN FILE -rm -r %{buildroot}%{python3_sitearch}/{tvtk,mayavi}/html/.buildinfo -rm -r %{buildroot}%{_docdir}/{python3-tvtk,mayavi}/html/.buildinfo - -# recompile cache files: we have modified some sources after install -%{?python_compileall} - -%fdupes %{buildroot}%{_docdir}/mayavi/ -%fdupes %{buildroot}%{_docdir}/python3-tvtk/ -%fdupes %{buildroot}%{python3_sitearch}/mayavi/ -%fdupes %{buildroot}%{python3_sitearch}/mayavi-%{version}-py*.egg-info -%fdupes %{buildroot}%{python3_sitearch}/tvtk/ -%fdupes %{buildroot}%{_datadir}/icons/ +%fdupes %{buildroot}%{python3_sitearch} +%fdupes %{buildroot}%{_datadir}/icons + +%ifnarch %ix86 %arm32 +%check +# see .gitub/workflows/headless-tests.yml +export ETS_TOOLKIT=null +%pytest_arch -v --pyargs tvtk +# no vtkAMRVolumeMapper (?) +donttest="(TestMlabModules and test_volume)" +donttest="$donttest or test_volume_works_with_probe" +%pytest_arch -v --pyargs mayavi -k "not ($donttest)" +%endif %files %doc README*.* %license LICENSE*.txt image_LICENSE*.txt %{_bindir}/mayavi2 +%{_bindir}/tvtk_doc %{_mandir}/man1/mayavi2.1%{?ext_man} %{_datadir}/applications/mayavi.desktop -%{python3_sitearch}/mayavi/ -%{python3_sitearch}/mayavi-%{version}*-info -%exclude %{_docdir}/mayavi/html/ - -%files -n python3-tvtk -%doc README*.* -%license LICENSE*.txt image_LICENSE*.txt -%{_bindir}/tvtk_doc %{_datadir}/applications/tvtk_doc.desktop %{_datadir}/icons/hicolor/ +%{python3_sitearch}/mayavi/ +%{python3_sitearch}/mayavi-%{version}*-info %{python3_sitearch}/tvtk/ -%exclude %{_docdir}/python3-tvtk/html/ - -%files doc -%license LICENSE*.txt image_LICENSE*.txt -%{_docdir}/mayavi/html/ - -%files -n python3-tvtk-doc -%license LICENSE*.txt image_LICENSE*.txt -%{_docdir}/python3-tvtk/html/ %files jupyter %license LICENSE*.txt image_LICENSE*.txt ++++++ mayavi-4.7.4.tar.gz -> mayavi-4.8.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/mayavi/mayavi-4.7.4.tar.gz /work/SRC/openSUSE:Factory/.mayavi.new.1597/mayavi-4.8.1.tar.gz differ: char 5, line 1 ++++++ mayavi-rpmlintrc ++++++ # test module called by the main program with `mayavi2 --test` and through pytest --pyargs addFilter("python-tests-in-package .*/mayavi/tests") addFilter("python-tests-in-package .*/tvtk/tests")
