Accepting request 825366 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/825366
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pyglet?expand=0&rev=9

pyglet-1.2.4-fix-image-import.patch

@@ -8,6 +8,6 @@ Index: pyglet/image/codecs/pil.py
      import Image
 -except ImportError:
 +except (ImportError, ValueError):
-     from PIL import Image
+     from PIL import Image, ImageSequence
+ 
 
- class PILImageDecoder(ImageDecoder):

pyglet-1.3.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b00570e7cdf6971af8953b6ece50d83d13272afa5d1f1197c58c0f478dd17743
-size 3577374

pyglet-1.5.7.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3faac2dad34946aecbce79a8658f89155436fe5c07332229160c6eba302ff40d
+size 3160434

pypng-license.patch

@@ -1,71 +0,0 @@
-Index: pyglet-1.3.2/LICENSE.pypng
-===================================================================
---- /dev/null
-+++ pyglet-1.3.2/LICENSE.pypng
-@@ -0,0 +1,27 @@
-+Copyright (C) 2006 Johann C. Rocholl <johann@browsershots.org>
-+Portions Copyright (C) 2009 David Jones <drj@pobox.com>
-+And probably portions Copyright (C) 2006 Nicko van Someren <nicko@nicko.org>
-+
-+Original concept by Johann C. Rocholl.
-+
-+LICENCE (MIT)
-+
-+Permission is hereby granted, free of charge, to any person
-+obtaining a copy of this software and associated documentation files
-+(the "Software"), to deal in the Software without restriction,
-+including without limitation the rights to use, copy, modify, merge,
-+publish, distribute, sublicense, and/or sell copies of the Software,
-+and to permit persons to whom the Software is furnished to do so,
-+subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
-Index: pyglet-1.3.2/pyglet/extlibs/png.py
-===================================================================
---- pyglet-1.3.2.orig/pyglet/extlibs/png.py
-+++ pyglet-1.3.2/pyglet/extlibs/png.py
-@@ -41,34 +41,6 @@
- # * Added Pyglet license
- 
- # png.py - PNG encoder/decoder in pure Python
--#
--# Copyright (C) 2006 Johann C. Rocholl <johann@browsershots.org>
--# Portions Copyright (C) 2009 David Jones <drj@pobox.com>
--# And probably portions Copyright (C) 2006 Nicko van Someren <nicko@nicko.org>
--#
--# Original concept by Johann C. Rocholl.
--#
--# LICENCE (MIT)
--#
--# Permission is hereby granted, free of charge, to any person
--# obtaining a copy of this software and associated documentation files
--# (the "Software"), to deal in the Software without restriction,
--# including without limitation the rights to use, copy, modify, merge,
--# publish, distribute, sublicense, and/or sell copies of the Software,
--# and to permit persons to whom the Software is furnished to do so,
--# subject to the following conditions:
--#
--# The above copyright notice and this permission notice shall be
--# included in all copies or substantial portions of the Software.
--#
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
--# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
--# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
--# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
--# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
--# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--# SOFTWARE.
- 
- """
- Pure Python PNG Reader/Writer

python-pyglet.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Aug  7 14:38:30 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
+
+- Update to version 1.5.7
+  * Support for Python 2 has been dropped. Python 3.5 is now the minimum supported version.
+  * Added preliminary support for loading 3D models from obj files.
+  * Switched from avbin to ffmpeg for decoding media files.
+  * Many long deprecated methods and attributes have now been removed.
+  * Many more bugfixes and small improvements
+- Updated pyglet-1.2.4-fix-image-import.patch
+- Dropped pypng-license.patch 
+
 -------------------------------------------------------------------
 Sun Sep 15 07:07:32 UTC 2019 - John Vandenberg <jayvdb@gmail.com>
 

python-pyglet.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-pyglet
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,9 +18,6 @@
 
 %define         X_display         :98
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-
-%bcond_with     pytest_helpers
-
 %ifarch %{arm} aarch64 x86_64 %{ix86} ppc64le
 %bcond_without  gtk2
 %bcond_without  test
@@ -32,45 +29,39 @@
 %bcond_with     test
 %bcond_with     gtk2
 %endif
-
+%define skip_python2 1
-# Set _version to 1.4 for 1.4.0betas and hg default
+%bcond_with     pytest_helpers
-%define _version 1.3.2
 Name:           python-pyglet
-Version:        1.3.2
+Version:        1.5.7
 Release:        0
 Summary:        Windowing and multimedia library
-# 1.3.2 contains a vendored old pypng
 License:        BSD-3-Clause AND MIT
 Group:          Development/Languages/Python
 URL:            https://bitbucket.org/pyglet/pyglet
-Source0:        https://files.pythonhosted.org/packages/source/p/pyglet/pyglet-%{version}.tar.gz
+Source0:        https://files.pythonhosted.org/packages/source/p/pyglet/pyglet-%{version}.zip
 Source1:        %{name}-rpmlintrc
 # PATCH-FIX-OPENSUSE pyglet-1.2.4-fix-image-import.patch -- fix "import Image"
 Patch0:         pyglet-1.2.4-fix-image-import.patch
-%if "%{_version}" == "1.3.2"
-Patch1:         pypng-license.patch
-%endif
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+BuildRequires:  unzip
 Requires:       Mesa-dri
-Requires:       config(Mesa)
+Requires:       libxcb-glx0
 Requires:       python-Pillow
 Requires:       python-future
-Requires:       libxcb-glx0
-%if "%{_version}" == "1.4"
 Requires:       python-pypng
-%endif
+Requires:       config(Mesa)
 Recommends:     alsa-lib
 Recommends:     fontconfig
 Recommends:     freetype
 Recommends:     libGLU1
 Recommends:     libopenal0
+BuildArch:      noarch
 %if %{with gtk2}
 Recommends:     gtk2
 %endif
-BuildArch:      noarch
 %if %{with test}
 BuildRequires:  %{python_module Pillow}
 BuildRequires:  %{python_module future}
@@ -108,33 +99,21 @@ developing games and other visually-rich applications.
 %prep
 %setup -q -n pyglet-%{version}
 %patch0
-%if "%{_version}" == "1.3.2"
-%patch1 -p1
-%endif
 
 # Can't be used for commercial purposes
 rm -r examples/noisy/
 
-# Not needed, and interferes with test discovery
-rm -r pyglet/extlibs/future/
-rm -r tests/extlibs/future/ tests/extlibs/mock.py
-
 # Windows only, and is a vendored module
 rm pyglet/font/win32*.py examples/font_comparison.py
 
-%if "%{_version}" == "1.4"
 # De-vendoring pypng-ing results in failures in v1.3.2, as it is using pypng an earlier pypng:
 # AttributeError: 'module' object has no attribute 'Writer'
 # pyglet 1.4 is using the latest pypng 0.0.19, the same version as python-pypng package
 rm pyglet/extlibs/png.py
 sed -i 's/import pyglet.extlibs.png as pypng/import png as pypng/' pyglet/image/codecs/png.py
-%endif
 
 # Files unneccessary for Linux runtimes
 rm -r \
-%if "%{_version}" == "1.3.2"
-  pyglet/*/carbon.py pyglet/input/carbon_*.py pyglet/window/carbon/ pyglet/image/codecs/quicktime.py tests/unit/test_osx.py \
-%endif
   pyglet/gl/lib_agl.py pyglet/gl/lib_wgl.py pyglet/gl/wgl*.py \
   pyglet/*/cocoa.py pyglet/*/quartz.py pyglet/*/win32.py \
   pyglet/input/darwin_hid.py pyglet/input/directinput.py pyglet/input/wintab.py \
@@ -152,12 +131,7 @@ sed -i 's/^\( *\).*gdkpixbuf2.*/\1pass/' pyglet/image/codecs/__init__.py
 # Allow invocation using unittest discover -vv --start-directory tests/xyz/
 # https://bitbucket.org/pyglet/pyglet/issues/231/allow-invocation-using-unittest-discover
 sed -i 's/from \.\.\./from tests./' \
-%if "%{_version}" == "1.3.2"
-  tests/interactive/window/test_window_multisample.py \
-%endif
-%if "%{_version}" == "1.4"
   tests/unit/media/test_listener.py \
-%endif
   tests/integration/image/test_gdkpixbuf2.py \
   tests/interactive/image/test_image.py
 
@@ -172,7 +146,6 @@ sed -i 's/arial/freeserif/g;s/Arial/FreeSerif/g' \
   tests/unit/test_text.py \
   tests/integration/platform/test_linux_fontconfig.py \
   tests/integration/font/*.py \
-  tests/interactive/font/*.py
 
 ## Unit tests
 
@@ -180,11 +153,6 @@ sed -i 's/arial/freeserif/g;s/Arial/FreeSerif/g' \
 sed -i "s/@unittest.skip('Requires changes to events from fork by Leif')/@pytest.mark.leif_fork/" tests/unit/test_events.py
 sed -i 's/import unittest/import unittest, pytest/' tests/unit/test_events.py
 
-%if "%{_version}" == "1.3.2"
-# https://bitbucket.org/pyglet/pyglet/issues/224/mediatest_playerplayertestcasetest_delete
-sed -i 's/test_delete/_test_delete/' tests/unit/media/test_player.py
-%endif
-
 # https://bitbucket.org/pyglet/pyglet/issues/223/clock-test-failures
 # Occasional errors on all platforms, and test_clock.py fails on Python 2 only
 rm tests/unit/test_clock_fps.py
@@ -212,7 +180,7 @@ rm -f tests/integration/graphics/test_retained_drawing*.py \
 
 # Fix missing interactive_test_base
 # See https://bitbucket.org/pyglet/pyglet/issues/234/interactive_test_base-is-missing
-sed -i '/interactive_test_base/d' tests/run.py tests/interactive/__init__.py
+sed -i '/interactive_test_base/d' tests/interactive/__init__.py
 rm tests/base/test_interactive_test_base.py
 
 # Final tidy up
@@ -225,7 +193,7 @@ find pyglet -name "*.py" -exec dos2unix "{}" "+"
 
 chmod a+x examples/synthesizer.py examples/soundspace/soundspace.py examples/game/version*/asteroid.py
 
-dos2unix examples/opengl_3.py examples/tablet.py
+dos2unix examples/tablet.py
 
 %build
 %python_build
@@ -290,16 +258,8 @@ fi
 
 %files %{python_files}
 %license LICENSE
-%if "%{_version}" == "1.3.2"
+%doc NOTICE README.md RELEASE_NOTES
-%license LICENSE.pypng
-%endif
-%doc NOTICE README RELEASE_NOTES
-%ifpython2
-%{_defaultdocdir}/python{,2}-pyglet/examples/
-%endif
-%ifpython3
 %{_defaultdocdir}/python3-pyglet/examples/
-%endif
 %{python_sitelib}/pyglet
 %{python_sitelib}/pyglet-%{version}-py*.egg-info