Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-opengl-accelerate for
openSUSE:Factory checked in at 2022-04-04 19:26:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-opengl-accelerate (Old)
and /work/SRC/openSUSE:Factory/.python-opengl-accelerate.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-opengl-accelerate"
Mon Apr 4 19:26:31 2022 rev:11 rq:966735 version:3.1.6
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-opengl-accelerate/python-opengl-accelerate.changes
2021-03-24 16:17:55.520252110 +0100
+++
/work/SRC/openSUSE:Factory/.python-opengl-accelerate.new.1900/python-opengl-accelerate.changes
2022-04-04 19:26:53.748190990 +0200
@@ -1,0 +2,18 @@
+Fri Apr 1 18:52:20 UTC 2022 - Scott Bradnick <[email protected]>
+
+- Adding _service file
+- Cleaning up Source0 declaration since PyPI doesn't have a tarball
+- Updating hash for 'accelerate/test' Source[1,2]
+- Adding code to %prep section to deal w/ how _service pulls down
+ files for the gzip'd tarball
+
+-------------------------------------------------------------------
+Thu Mar 31 15:25:18 UTC 2022 - Scott Bradnick <[email protected]>
+
+- Update to 3.1.6
+ * Pulled directly from https://github.com/mcfletch/pyopengl since
+ pypi.org (via py2pack fetch) doesn't have this version available.
+ * Seems that some packages which use PyOpenGL and accelerate have
+ a soft requirement that they're the same version.
+
+-------------------------------------------------------------------
Old:
----
PyOpenGL-accelerate-3.1.5.tar.gz
New:
----
PyOpenGL-accelerate-3.1.6.tar.gz
_service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-opengl-accelerate.spec ++++++
--- /var/tmp/diff_new_pack.QkwAAQ/_old 2022-04-04 19:26:54.292184753 +0200
+++ /var/tmp/diff_new_pack.QkwAAQ/_new 2022-04-04 19:26:54.296184707 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-opengl-accelerate
#
-# 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
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define tarname PyOpenGL-accelerate
-%define _version 3.1.5
+%define _version 3.1.6
Name: python-opengl-accelerate
Version: %{_version}
Release: 0
@@ -26,10 +26,11 @@
License: BSD-3-Clause
Group: Development/Libraries/Python
URL: http://pyopengl.sourceforge.net
-Source0:
https://files.pythonhosted.org/packages/source/P/%{tarname}/%{tarname}-%{_version}.tar.gz
+Source0: %{tarname}-%{_version}.tar.gz
# test files: GitHub repo has no tags, use commit hash
-Source1:
https://github.com/mcfletch/pyopengl/raw/6ec398da44/accelerate/tests/test_arraydatatypeaccel.py
-Source2:
https://github.com/mcfletch/pyopengl/raw/6ec398da44/accelerate/tests/test_numpyaccel.py
+Source1:
https://github.com/mcfletch/pyopengl/raw/c26398b91a/accelerate/tests/test_arraydatatypeaccel.py
+Source2:
https://github.com/mcfletch/pyopengl/raw/c26398b91a/accelerate/tests/test_numpyaccel.py
+#
BuildRequires: %{python_module Cython}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module opengl >= %{version}}
@@ -51,6 +52,12 @@
%prep
%setup -q -n %{tarname}-%{_version}
+# _service pulldown creates %%{tarname}-%%{_version}/accelerate/<required
files>,
+# move them to root of build area and remove 'accelerate' directory
+# to continue as normal.
+mv accelerate/* ./
+rmdir accelerate
+
# Force Cython to rebuild .c files
rm src/*.c
++++++ PyOpenGL-accelerate-3.1.5.tar.gz -> PyOpenGL-accelerate-3.1.6.tar.gz
++++++
++++ 229329 lines of diff (skipped)
++++++ _service ++++++
<!--
# vim: set syntax=xml
-->
<services>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/mcfletch/pyopengl</param>
<param name="scm">git</param>
<param name="include">accelerate</param>
<!-- INFO: This is latest revision as of 20220401
<param name="revision">227f9c66976d9f5dadf62b9a97e6beaec84831ca</param>
-->
<param name="versionformat">%h</param>
<!-- Not sure if it's because of a lack of tagging, etc
but this was the only hacky way I could make this work
Not sure if it's a limitation of 'obs-service-tar_scm'
or my understanding of it.
-->
<param name="versionrewrite-pattern">227f9c66</param>
<param name="versionrewrite-replacement">3.1.6</param>
<param name="filename">PyOpenGL-accelerate</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">gz</param>
</service>
</services>
++++++ test_arraydatatypeaccel.py ++++++
--- /var/tmp/diff_new_pack.QkwAAQ/_old 2022-04-04 19:26:54.564181634 +0200
+++ /var/tmp/diff_new_pack.QkwAAQ/_new 2022-04-04 19:26:54.568181589 +0200
@@ -3,12 +3,18 @@
from OpenGL.arrays import vbo
from OpenGL import GL
from OpenGL._bytes import integer_types
+import pytest
try:
import numpy
except ImportError:
numpy = None
+try:
+ import OpenGL_accelerate
+except ImportError:
+ pytest.skip('Accelerate not installed, skipping', allow_module_level=True)
class _BaseTest( object ):
+ array = None
def setUp( self ):
self.handler = adt.ArrayDatatype
assert self.handler.isAccelerated
@@ -38,39 +44,41 @@
p = self.handler.arrayToGLType( self.array )
assert p == GL.GL_FLOAT
-if numpy:
- # Skip if modifies the functions, which are *shared* between the
- # classes...
- #@pytest.mark.skipif( not numpy, reason="Numpy not available")
- class TestNumpy( _BaseTest, unittest.TestCase ):
- def setUp( self ):
- self.array = numpy.array( [[1,2,3],[4,5,6]],'f')
- super(TestNumpy,self).setUp()
- def test_dataPointer( self ):
- p = self.handler.dataPointer( self.array )
- assert isinstance( p, integer_types)
- assert p == self.array.ctypes.data
- def test_zeros( self ):
- p = self.handler.zeros( (2,3,4), 'f' )
- assert p.shape == (2,3,4)
- assert p.dtype == numpy.float32
- def test_asArrayConvert( self ):
- p = self.handler.asArray( self.array, GL.GL_DOUBLE )
- assert p is not self.array
- assert p.dtype == numpy.float64
- p = self.handler.asArray( self.array, 'd' )
- assert p is not self.array
- assert p.dtype == numpy.float64
- def test_zeros_typed( self ):
- z = self.handler.zeros( (2,3,4), GL.GL_FLOAT)
- assert z.shape == (2,3,4)
- assert z.dtype == numpy.float32
- def test_downconvert( self ):
- p = self.handler.asArray( numpy.array( [1,2,3],'d'), GL.GL_FLOAT )
- assert p.dtype == numpy.float32
- def test_zeros_small( self ):
- z = self.handler.zeros( 0, GL.GL_BYTE )
- assert z.dtype == numpy.byte, z
+# Skip if modifies the functions, which are *shared* between the
+# classes...
[email protected]( not numpy, reason="Numpy not available")
+class TestNumpy( _BaseTest, unittest.TestCase ):
+ def setUp( self ):
+ super(TestNumpy,self).setUp()
+ self.array = numpy.array( [[1,2,3],[4,5,6]],'f')
+ handler = adt.ArrayDatatype.getHandler( self.array )
+ handler.registerReturn( )
+
+ def test_dataPointer( self ):
+ p = self.handler.dataPointer( self.array )
+ assert isinstance( p, integer_types)
+ assert p == self.array.ctypes.data
+ def test_zeros( self ):
+ p = self.handler.zeros( (2,3,4), 'f' )
+ assert p.shape == (2,3,4)
+ assert p.dtype == numpy.float32
+ def test_asArrayConvert( self ):
+ p = self.handler.asArray( self.array, GL.GL_DOUBLE )
+ assert p is not self.array
+ assert p.dtype == numpy.float64
+ p = self.handler.asArray( self.array, 'd' )
+ assert p is not self.array
+ assert p.dtype == numpy.float64
+ def test_zeros_typed( self ):
+ z = self.handler.zeros( (2,3,4), GL.GL_FLOAT)
+ assert z.shape == (2,3,4)
+ assert z.dtype == numpy.float32
+ def test_downconvert( self ):
+ p = self.handler.asArray( numpy.array( [1,2,3],'d'), GL.GL_FLOAT )
+ assert p.dtype == numpy.float32
+ def test_zeros_small( self ):
+ z = self.handler.zeros( (0,), GL.GL_BYTE )
+ assert z.dtype == numpy.byte, z
class TestVBO( _BaseTest, unittest.TestCase ):
def setUp( self ):
