Skip to content

Replaced Python 2 long with plain python int #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChrisBarker-NOAA wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Replaced Python 2 long with plain python int #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
509813f
added test workflow
ChrisBarker-NOAA Jun 20, 2025
3f7787d
cleaned up test config a bit -- tests not passing, but aren't passing…
ChrisBarker-NOAA Jun 20, 2025
641f3d0
applied patch to make accelerate compile -- added tests for accelerate
ChrisBarker-NOAA Jun 20, 2025
92abdc4
removed extra install of PyOpenGL
ChrisBarker-NOAA Jun 20, 2025
f88d98b
updated fix for python2 long type to use python int.
ChrisBarker-NOAA Jul 10, 2025
9f56825
removed test yaml file for this PR.
ChrisBarker-NOAA Jul 10, 2025
2ca7b5c
updated pyproject.toml for Cyton3 and Python>=3.9
ChrisBarker-NOAA Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions accelerate/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[project]
name="PyOpenGL-accelerate"
dynamic=["version"]
requires-python = ">= 3.9" # At least Python 3.9
description = "Cython-coded accelerators for PyOpenGL"
authors = [
{name="Mike C. Fletcher",email="[email protected]"},
Expand All @@ -23,7 +24,6 @@ keywords = [
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",
Expand All @@ -36,7 +36,7 @@ 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" ]
requires = [ "setuptools >= 42.0", "Cython >= 3", "numpy" ]
build-backend = "setuptools.build_meta"

[tool.setuptools.dynamic]
Expand All @@ -45,5 +45,5 @@ version = {attr = "OpenGL_accelerate.__version__"}
[tool.setuptools.packages.find]
namespaces=false
include=["OpenGL_accelerate"]
exclude=["tests","src"]
exclude=["tests", "src"]

6 changes: 3 additions & 3 deletions accelerate/src/vbo.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ cdef class VBO:
assert not self.created, """Already created the buffer"""
buffers = self.get_implementation().glGenBuffers(1)
try:
self.buffer = long( buffers )
except (TypeError,ValueError) as err:
self.buffer = int( buffers )
except (TypeError, ValueError) as err:
self.buffer = buffers[0]
self.target = self.c_resolve( self.target_spec )
self.usage = self.c_resolve( self.usage_spec )
Expand Down Expand Up @@ -242,7 +242,7 @@ cdef class VBO:
"""Add an integer to this VBO (offset)"""
if hasattr( other, 'offset' ):
other = other.offset
assert isinstance( other, (int,long) ), """Only know how to add integer/long offsets"""
assert isinstance( other, int), """Only know how to add integer offsets"""
return VBOOffset( self, other )
cdef int check_live( self ):
if self.data is _NULL:
Expand Down