Hello community, here is the log from the commit of package python-wxPython for openSUSE:Factory checked in at 2020-10-02 17:16:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-wxPython (Old) and /work/SRC/openSUSE:Factory/.python-wxPython.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-wxPython" Fri Oct 2 17:16:31 2020 rev:9 rq:838865 version:4.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-wxPython/python-wxPython.changes 2020-08-06 17:32:54.417105432 +0200 +++ /work/SRC/openSUSE:Factory/.python-wxPython.new.4249/python-wxPython.changes 2020-10-02 17:16:49.354109919 +0200 @@ -1,0 +2,7 @@ +Wed Sep 30 17:48:02 UTC 2020 - Stefan BrĂ¼ns <stefan.bru...@rwth-aachen.de> + +- Use system wxWidgets (wxGTK3) instead of bundling +- Cleanup test dependencies and check section (tests still disabled + due to too many failures) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-wxPython.spec ++++++ --- /var/tmp/diff_new_pack.JfTN5J/_old 2020-10-02 17:16:51.398110008 +0200 +++ /var/tmp/diff_new_pack.JfTN5J/_new 2020-10-02 17:16:51.402110007 +0200 @@ -21,7 +21,7 @@ %define oldpython python %define X_display ":98" %bcond_with test -%bcond_with syswx +%bcond_without syswx %if %{with syswx} %define wx_args --use_syswx --gtk3 -v %else @@ -32,6 +32,7 @@ Release: 0 Summary: The "Phoenix" variant of the wxWidgets Python bindings License: GPL-2.0-or-later +Group: System/Libraries URL: https://github.com/wxWidgets/Phoenix Source: https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-%{version}.tar.gz Source1: python-wxPython-rpmlintrc @@ -52,12 +53,8 @@ BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: python-rpm-macros -%if %{with test} -BuildRequires: xorg-x11-server -BuildRequires: pkgconfig(cppunit) -%endif %if %{with syswx} -BuildRequires: wxGTK3-devel +BuildRequires: wxGTK3-devel >= 3.1.4 %else BuildRequires: freeglut-devel BuildRequires: gstreamer-plugins-base-devel @@ -82,9 +79,15 @@ Conflicts: python-wxWidgets Provides: python-wxWidgets = %{version} %if %{with test} +BuildRequires: %{python_module numpy} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module pytest} BuildRequires: %{python_module six} +# Need at least one font installed +BuildRequires: google-opensans-fonts +BuildRequires: wxWidgets-lang +BuildRequires: xorg-x11-server +BuildRequires: pkgconfig(cppunit) %endif %ifpython2 Conflicts: %{oldpython}-wxWidgets @@ -103,6 +106,7 @@ %package lang # We cannot use %%lang_package here. Editra translations use noarch incompatible path. Summary: Languages for package %{name} +Group: System/Libraries Requires: %{name} = %{version} Requires: python-base Supplements: (bundle-lang-other and %{name}) @@ -112,12 +116,7 @@ Provides translations to the package %{name}. %prep -%setup -q -n wxPython-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%autosetup -n wxPython-%{version} -p1 sed -i -e '/^#!\//, 1d' wx/py/*.py sed -i -e '/^#!\//, 1d' wx/tools/*.py sed -i -e '/^#!\//, 1d' wx/py/tests/*.py @@ -145,23 +144,28 @@ %python_clone -a %{buildroot}%{_bindir}/wxdocs %python_clone -a %{buildroot}%{_bindir}/wxget -%if %{with test} %check +%if %{with test} ############################################# ### Launch a virtual framebuffer X server ### ############################################# export DISPLAY=%{X_display} Xvfb %{X_display} >& Xvfb.log & trap "kill $! || true" EXIT -sleep 10 - -rm -r build -rm -r _build* +sleep 5 +# Make sure "import wx" does not confuse the wx dir with the module mv wx wx_temp -%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} -$python -B build.py test %{wx_args} -} + +# Run each test as a separate process, otherwise multiple app +# instances will corrupt each others static data +# Run UiAction tests one by one +%pytest_arch --forked -n 1 -k 'test_uiaction or test_mousemanager' unittests/ +# Skip Auto ID management test (only enabled on Windows) +# Skip Frame restore (requires a window manager) +# Skip UiAction tests (already done) +%pytest_arch --forked -n auto -k '(not test_newIdRef03) and (not test_uiaction) and (not test_mousemanager) and (not test_frameRestore)' unittests/ + mv wx_temp wx %endif @@ -172,8 +176,8 @@ %python_uninstall_alternative pywxrc %files %{python_files} -%license LICENSE.txt -%doc CHANGES.rst README.rst TODO.rst license/*.txt +%license LICENSE.txt license/*.txt +%doc CHANGES.rst README.rst TODO.rst %python_alternative %{_bindir}/helpviewer %python_alternative %{_bindir}/img2png %python_alternative %{_bindir}/img2py