From c1da74ee5287e1a9ce9f80ab7b08a093ed5f1a7b450e2fd260a08bc14f23e757 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 23 Mar 2021 23:33:24 +0000 Subject: [PATCH] Accepting request 880830 from home:bnavigator:branches:devel:languages:python - Don't test with pygame for python36. Pygame requires NumPy which is not available for python36 on TW. OBS-URL: https://build.opensuse.org/request/show/880830 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-opengl?expand=0&rev=30 --- python-opengl.changes | 6 ++++++ python-opengl.spec | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/python-opengl.changes b/python-opengl.changes index d634aec..deaa9b5 100644 --- a/python-opengl.changes +++ b/python-opengl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 23 21:49:55 UTC 2021 - Ben Greiner + +- Don't test with pygame for python36. Pygame requires NumPy which + is not available for python36 on TW. + ------------------------------------------------------------------- Thu Apr 30 18:15:00 UTC 2020 - Benjamin Greiner diff --git a/python-opengl.spec b/python-opengl.spec index 6c6dd01..4c57571 100644 --- a/python-opengl.spec +++ b/python-opengl.spec @@ -1,7 +1,7 @@ # # spec file for package python-opengl # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,12 +42,12 @@ Recommends: python-numpy Recommends: python-opengl-accelerate Recommends: python-tk Recommends: tk >= 8.1 +Provides: python-PyOpenGL = %{version}-%{release} BuildArch: noarch %if %{with test} BuildRequires: %{python_module Pillow} BuildRequires: %{python_module opengl-accelerate} BuildRequires: %{python_module psutil} -BuildRequires: %{python_module pygame} BuildRequires: %{python_module pytest-xvfb} BuildRequires: %{python_module pytest} BuildRequires: Mesa-dri @@ -57,6 +57,7 @@ BuildRequires: libgle-devel BuildRequires: python3-numpy BuildRequires: swig BuildRequires: tk-devel +BuildRequires: %{python_module pygame if (%python-base without python36-base)} BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(x11) @@ -87,9 +88,9 @@ find . -name '*.py' -exec touch -mat $FAKE_TIMESTAMP {} \; %if %{with test} %check -# test_buffer_api_basic is a test specific to opengl-accelerate, failing on i586 and armv7l -# https://github.com/mcfletch/pyopengl/issues/29 -%pytest -v -k "not test_buffer_api_basic" tests +# don't test anything on python36: all tests need pygame, which is not available +python36_flags="--version" +%pytest ${$python_flags} tests %endif %if !%{with test}