PyOpenGL-accelerate 3.1.9a2__tar.gz → 4.0.0a1__tar.gz

{pyopengl_accelerate-3.1.9a2 → pyopengl_accelerate-4.0.0a1}/OpenGL_accelerate/__init__.py

@@ -7,5 +7,5 @@ PyOpenGL package and is built via the setupaccel.py
 script in the top level of the PyOpenGL source package.
 """
 
-__version__ = "3.1.9a2"
-__version_tuple__ = (3, 1, 9)
+__version__ = "4.0.0a1"
+__version_tuple__ = (4, 0, 0)

pyopengl_accelerate-4.0.0a1/PKG-INFO

@@ -0,0 +1,44 @@
+Metadata-Version: 2.4
+Name: PyOpenGL-accelerate
+Version: 4.0.0a1
+Summary: Cython-coded accelerators for PyOpenGL
+Home-page: http://pyopengl.sourceforge.net
+Download-URL: http://sourceforge.net/project/showfiles.php?group_id=5988
+Author: Mike C. Fletcher
+Author-email: "Mike C. Fletcher" <mcfletch@vrplumber.com>
+License-Expression: BSD-3-Clause
+Project-URL: Homepage, https://mcfletch.github.io/pyopengl/
+Project-URL: Download, https://pypi.org/project/PyOpenGL-accelerate/
+Project-URL: Source, https://github.com/mcfletch/pyopengl
+Project-URL: Documentation, https://mcfletch.github.io/pyopengl/documentation/index.html
+Keywords: Graphics,3D,OpenGL,GLU,GLUT,GLE,GLX,EXT,ARB,Mesa,PyOpenGL
+Platform: Win32
+Platform: Linux
+Platform: OS-X
+Platform: Posix
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Multimedia :: Graphics :: 3D Rendering
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Intended Audience :: Developers
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: license.txt
+Dynamic: download-url
+Dynamic: license-file
+
+# Acceleration code for PyOpenGL
+
+This set of C (Cython) extensions provides acceleration of common operations
+for slow points in PyOpenGL 3.x. It is not a requirement for using PyOpenGL
+but performance without it will be poor.
+
+## Build Process
+
+Cython is updated frequently to support newer versions of Python. As of
+release 3.1.9 we no longer check in the Cython generated code for the
+wrapper modules, relying on the build machines to generate the wrappers.
+
+The Github CI Pipeline should generate and release binary builds for most
+major platforms (Windows, Linux, Mac), but if you need to build from source,
+a `pip install .` **should** work from the PyOpenGL repository.

pyopengl_accelerate-4.0.0a1/PyOpenGL_accelerate.egg-info/PKG-INFO

@@ -0,0 +1,44 @@
+Metadata-Version: 2.4
+Name: PyOpenGL-accelerate
+Version: 4.0.0a1
+Summary: Cython-coded accelerators for PyOpenGL
+Home-page: http://pyopengl.sourceforge.net
+Download-URL: http://sourceforge.net/project/showfiles.php?group_id=5988
+Author: Mike C. Fletcher
+Author-email: "Mike C. Fletcher" <mcfletch@vrplumber.com>
+License-Expression: BSD-3-Clause
+Project-URL: Homepage, https://mcfletch.github.io/pyopengl/
+Project-URL: Download, https://pypi.org/project/PyOpenGL-accelerate/
+Project-URL: Source, https://github.com/mcfletch/pyopengl
+Project-URL: Documentation, https://mcfletch.github.io/pyopengl/documentation/index.html
+Keywords: Graphics,3D,OpenGL,GLU,GLUT,GLE,GLX,EXT,ARB,Mesa,PyOpenGL
+Platform: Win32
+Platform: Linux
+Platform: OS-X
+Platform: Posix
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Multimedia :: Graphics :: 3D Rendering
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Intended Audience :: Developers
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: license.txt
+Dynamic: download-url
+Dynamic: license-file
+
+# Acceleration code for PyOpenGL
+
+This set of C (Cython) extensions provides acceleration of common operations
+for slow points in PyOpenGL 3.x. It is not a requirement for using PyOpenGL
+but performance without it will be poor.
+
+## Build Process
+
+Cython is updated frequently to support newer versions of Python. As of
+release 3.1.9 we no longer check in the Cython generated code for the
+wrapper modules, relying on the build machines to generate the wrappers.
+
+The Github CI Pipeline should generate and release binary builds for most
+major platforms (Windows, Linux, Mac), but if you need to build from source,
+a `pip install .` **should** work from the PyOpenGL repository.

{pyopengl_accelerate-3.1.9a2 → pyopengl_accelerate-4.0.0a1}/README.md

@@ -6,10 +6,10 @@ but performance without it will be poor.
 
 ## Build Process
 
-Cython is updated frequently to support newer versions of Python. As of 
-release 3.1.9 we no longer check in the Cython generated code for the 
+Cython is updated frequently to support newer versions of Python. As of
+release 3.1.9 we no longer check in the Cython generated code for the
 wrapper modules, relying on the build machines to generate the wrappers.
 
-The Github CI Pipeline should generate and release binary builds for most 
+The Github CI Pipeline should generate and release binary builds for most
 major platforms (Windows, Linux, Mac), but if you need to build from source,
 a `pip install .` **should** work from the PyOpenGL repository.

{pyopengl_accelerate-3.1.9a2 → pyopengl_accelerate-4.0.0a1}/pyproject.toml

@@ -6,7 +6,9 @@ authors = [
     {name="Mike C. Fletcher",email="mcfletch@vrplumber.com"},
 ]
 readme = {file="README.md", content-type = "text/markdown"}
-license={file="license.txt"}
+license = "BSD-3-Clause"
+license-files = ["license.txt"]
+requires-python = ">=3.9"
 keywords = [
     "Graphics",
     "3D",
@@ -21,9 +23,7 @@ keywords = [
     "PyOpenGL",
 ]
 classifiers = [
-    "License :: OSI Approved :: BSD License",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 2",
     "Programming Language :: Python :: 3",
     "Topic :: Multimedia :: Graphics :: 3D Rendering",
     "Topic :: Software Development :: Libraries :: Python Modules",
@@ -36,7 +36,13 @@ Source = "https://github.com/mcfletch/pyopengl"
 Documentation = "https://mcfletch.github.io/pyopengl/documentation/index.html"
 
 [build-system]
-requires = [ "setuptools >= 42.0", "Cython >= 0.28", "numpy" ]
+# numpy 2.0+ produces wheels that are ABI-compatible with numpy >= 1.26 at runtime
+# via the PyDataType_* accessor backports. Mostly hit by cibuildwheel.
+requires = [
+    "setuptools >= 77.0",
+    "Cython >= 0.28",
+    "numpy >= 2.0",
+]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools.dynamic]

{pyopengl_accelerate-3.1.9a2 → pyopengl_accelerate-4.0.0a1}/setup.cfg

@@ -7,8 +7,8 @@ author_email = mcfletch@vrplumber.com
 url = http://pyopengl.sourceforge.net
 download_url = http://sourceforge.net/project/showfiles.php?group_id=5988
 license = BSD
-long_description = file: README.txt
-long_description_content_type = text/plain
+long_description = file: README.md
+long_description_content_type = text/markdown
 keywords = PyOpenGL, accelerate, Cython
 platforms = Win32, Linux, OS-X, Posix
 classifiers = 

{pyopengl_accelerate-3.1.9a2 → pyopengl_accelerate-4.0.0a1}/src/arraydatatype.pyx

@@ -292,7 +292,35 @@ cdef class Output(cArgConverter):
     cdef object c_call( self, tuple pyArgs, int index, object baseOperation ):
         """Return pyArgs[ self.index ]"""
         return self.arrayType.c_zeros( self.c_getSize(pyArgs), self.arrayType.typeConstant )
-    
+
+    cdef object c_orInput( self, tuple pyArgs, int index ):
+        """Coerce a passed-in output array, refusing a lossy copy.
+
+        When the caller's array is already an acceptable buffer, asArray returns
+        it unchanged and the GL result is written straight back into it. When it
+        is the wrong type, asArray must *copy* it to match; if that copy is
+        smaller than the caller's buffer, the read is truncated into the copy and
+        never reaches the caller's array -- the silent "returns zeroes" bug.
+        Detect the shrinking copy and raise. Correctly-typed arrays are not
+        copied, so they never trip this.
+        """
+        value = pyArgs[index]
+        result = self.arrayType.asArray( value )
+        if result is not value:
+            try:
+                rbytes = self.arrayType.arrayByteCount( result )
+                vbytes = self.arrayType.arrayByteCount( value )
+            except Exception:
+                return result
+            if rbytes < vbytes:
+                raise TypeError(
+                    '%s: pass-in output array was coerced to a smaller buffer '
+                    '(%d < %d bytes), so the GL result cannot be written back '
+                    'into your array. Pass a correctly-typed array, or None to '
+                    'have one allocated.' % ( self.name, rbytes, vbytes )
+                )
+        return result
+
     def oldStyleReturn( self, object result, object baseOperation, tuple pyArgs, tuple cArgs ):
         """Retrieve cArgs[ self.index ]"""
         #TODO: make this a c_api-bearing value, not a Python function call
@@ -313,7 +341,7 @@ cdef class OutputOrInput( Output ):
     cdef object c_call( self, tuple pyArgs, int index, object baseOperation ):
         """Return pyArgs[ self.index ]"""
         if pyArgs[index] is not DO_OUTPUT[0] and pyArgs[index] is not DO_OUTPUT[1]:
-            return self.arrayType.asArray( pyArgs[index] )
+            return self.c_orInput( pyArgs, index )
         return self.arrayType.c_zeros( self.c_getSize(pyArgs), self.arrayType.typeConstant )
 
 cdef class SizedOutput( Output ):
@@ -353,7 +381,7 @@ cdef class SizedOutputOrInput( SizedOutput ):
     cdef object c_call( self, tuple pyArgs, int index, object baseOperation ):
         """Return pyArgs[ self.index ]"""
         if pyArgs[index] is not DO_OUTPUT[0] and pyArgs[index] is not DO_OUTPUT[1]:
-            return self.arrayType.asArray( pyArgs[index] )
+            return self.c_orInput( pyArgs, index )
         return self.arrayType.c_zeros( self.c_getSize(pyArgs), self.arrayType.typeConstant )
     
 

{pyopengl_accelerate-3.1.9a2 → pyopengl_accelerate-4.0.0a1}/src/numpy_formathandler.pyx

@@ -20,6 +20,8 @@ cdef extern from "numpy/arrayobject.h":
     int NPY_ARRAY_FORCECAST
     int PyArray_ISCARRAY( np.ndarray instance )
     int PyArray_ISCARRAY_RO( np.ndarray instance )
+
+    # cdef object PyArray_FromScalar(object scalar, np.dtype outcode)
     cdef np.ndarray PyArray_Zeros(int nd, np.npy_intp* dims, np.dtype, int fortran)
     cdef np.ndarray PyArray_EnsureArray(object)
     cdef int PyArray_FillWithScalar(np.ndarray, object)
@@ -87,6 +89,8 @@ cdef class NumpyHandler(FormatHandler):
         self.gl_constant_to_array = gl_to_a
     
     cdef np.ndarray c_check_array( self, object instance ):
+        # if PyArray_CheckScalar( instance ):
+        #     return PyArray_FromScalar(instance, NULL)
         if not PyArray_Check( instance ):
             raise TypeError(
                 """Numpy format handler passed a non-numpy-array object %s (of type %s)"""%( instance, type(instance) ),

{pyopengl_accelerate-3.1.9a2 → pyopengl_accelerate-4.0.0a1}/src/vbo.pyx

@@ -4,6 +4,10 @@ import ctypes, weakref
 from OpenGL_accelerate.formathandler cimport FormatHandler
 from OpenGL import error
 from OpenGL._bytes import bytes,unicode
+try:
+    long = long
+except NameError as err:
+    long = int
 
 cdef extern from "Python.h":
     cdef void Py_XINCREF( object )

pyopengl_accelerate-3.1.9a2/PKG-INFO

@@ -1,82 +0,0 @@
-Metadata-Version: 2.1
-Name: PyOpenGL-accelerate
-Version: 3.1.9a2
-Summary: Cython-coded accelerators for PyOpenGL
-Home-page: http://pyopengl.sourceforge.net
-Download-URL: http://sourceforge.net/project/showfiles.php?group_id=5988
-Author: Mike C. Fletcher
-Author-email: "Mike C. Fletcher" <mcfletch@vrplumber.com>
-License: NOTE:
-        
-        	THIS SOFTWARE IS NOT FAULT TOLERANT AND SHOULD NOT BE USED IN ANY
-        	SITUATION ENDANGERING HUMAN LIFE OR PROPERTY.
-        	
-        OpenGL-ctypes PyOpenGL-accelerate License
-        
-        	Copyright (c) 2005-2009, Michael C. Fletcher and Contributors
-        	All rights reserved.
-        	
-        	Redistribution and use in source and binary forms, with or without
-        	modification, are permitted provided that the following conditions
-        	are met:
-        	
-        		Redistributions of source code must retain the above copyright
-        		notice, this list of conditions and the following disclaimer.
-        	
-        		Redistributions in binary form must reproduce the above
-        		copyright notice, this list of conditions and the following
-        		disclaimer in the documentation and/or other materials
-        		provided with the distribution.
-        	
-        		The name of Michael C. Fletcher, or the name of any Contributor,
-        		may not be used to endorse or promote products derived from this 
-        		software without specific prior written permission.
-        	
-        	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-        	``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-        	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-        	FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-        	COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-        	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-        	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-        	SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-        	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-        	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-        	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-        	OF THE POSSIBILITY OF SUCH DAMAGE. 
-        
-        
-        
-Project-URL: Homepage, https://mcfletch.github.io/pyopengl/
-Project-URL: Download, https://pypi.org/project/PyOpenGL-accelerate/
-Project-URL: Source, https://github.com/mcfletch/pyopengl
-Project-URL: Documentation, https://mcfletch.github.io/pyopengl/documentation/index.html
-Keywords: Graphics,3D,OpenGL,GLU,GLUT,GLE,GLX,EXT,ARB,Mesa,PyOpenGL
-Platform: Win32
-Platform: Linux
-Platform: OS-X
-Platform: Posix
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Multimedia :: Graphics :: 3D Rendering
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Intended Audience :: Developers
-Description-Content-Type: text/markdown
-
-# Acceleration code for PyOpenGL
-
-This set of C (Cython) extensions provides acceleration of common operations
-for slow points in PyOpenGL 3.x. It is not a requirement for using PyOpenGL
-but performance without it will be poor.
-
-## Build Process
-
-Cython is updated frequently to support newer versions of Python. As of 
-release 3.1.9 we no longer check in the Cython generated code for the 
-wrapper modules, relying on the build machines to generate the wrappers.
-
-The Github CI Pipeline should generate and release binary builds for most 
-major platforms (Windows, Linux, Mac), but if you need to build from source,
-a `pip install .` **should** work from the PyOpenGL repository.

pyopengl_accelerate-3.1.9a2/PyOpenGL_accelerate.egg-info/PKG-INFO

@@ -1,82 +0,0 @@
-Metadata-Version: 2.1
-Name: PyOpenGL-accelerate
-Version: 3.1.9a2
-Summary: Cython-coded accelerators for PyOpenGL
-Home-page: http://pyopengl.sourceforge.net
-Download-URL: http://sourceforge.net/project/showfiles.php?group_id=5988
-Author: Mike C. Fletcher
-Author-email: "Mike C. Fletcher" <mcfletch@vrplumber.com>
-License: NOTE:
-        
-        	THIS SOFTWARE IS NOT FAULT TOLERANT AND SHOULD NOT BE USED IN ANY
-        	SITUATION ENDANGERING HUMAN LIFE OR PROPERTY.
-        	
-        OpenGL-ctypes PyOpenGL-accelerate License
-        
-        	Copyright (c) 2005-2009, Michael C. Fletcher and Contributors
-        	All rights reserved.
-        	
-        	Redistribution and use in source and binary forms, with or without
-        	modification, are permitted provided that the following conditions
-        	are met:
-        	
-        		Redistributions of source code must retain the above copyright
-        		notice, this list of conditions and the following disclaimer.
-        	
-        		Redistributions in binary form must reproduce the above
-        		copyright notice, this list of conditions and the following
-        		disclaimer in the documentation and/or other materials
-        		provided with the distribution.
-        	
-        		The name of Michael C. Fletcher, or the name of any Contributor,
-        		may not be used to endorse or promote products derived from this 
-        		software without specific prior written permission.
-        	
-        	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-        	``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-        	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-        	FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-        	COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-        	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-        	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-        	SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-        	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-        	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-        	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-        	OF THE POSSIBILITY OF SUCH DAMAGE. 
-        
-        
-        
-Project-URL: Homepage, https://mcfletch.github.io/pyopengl/
-Project-URL: Download, https://pypi.org/project/PyOpenGL-accelerate/
-Project-URL: Source, https://github.com/mcfletch/pyopengl
-Project-URL: Documentation, https://mcfletch.github.io/pyopengl/documentation/index.html
-Keywords: Graphics,3D,OpenGL,GLU,GLUT,GLE,GLX,EXT,ARB,Mesa,PyOpenGL
-Platform: Win32
-Platform: Linux
-Platform: OS-X
-Platform: Posix
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Multimedia :: Graphics :: 3D Rendering
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Intended Audience :: Developers
-Description-Content-Type: text/markdown
-
-# Acceleration code for PyOpenGL
-
-This set of C (Cython) extensions provides acceleration of common operations
-for slow points in PyOpenGL 3.x. It is not a requirement for using PyOpenGL
-but performance without it will be poor.
-
-## Build Process
-
-Cython is updated frequently to support newer versions of Python. As of 
-release 3.1.9 we no longer check in the Cython generated code for the 
-wrapper modules, relying on the build machines to generate the wrappers.
-
-The Github CI Pipeline should generate and release binary builds for most 
-major platforms (Windows, Linux, Mac), but if you need to build from source,
-a `pip install .` **should** work from the PyOpenGL repository.