Skip to content

Commit

Permalink
v3.1.9
Browse files Browse the repository at this point in the history
  • Loading branch information
cgohlke committed Jan 26, 2025
1 parent c933c44 commit 23d56dc
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 40 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:

env:
PYOPENGL_VER: release-3.1.8
PYOPENGL_VER: release-3.1.9
FREEGLUT_VER: v3.6.0
GLE_VER: 3.1.0
PIP_NO_VERIFY: 0
Expand All @@ -15,7 +15,7 @@ env:
# CIBW_TEST_REQUIRES:
# CIBW_TEST_COMMAND:
# CIBW_TEST_SKIP: "*win32 cp313*"
CIBW_SKIP: "pp* cp36* cp37* cp38*"
CIBW_SKIP: "pp* cp36* cp37* cp38* cp39*"
MSBUILDTREATHIGHERTOOLSVERSIONASCURRENT: 1

jobs:
Expand All @@ -38,7 +38,7 @@ jobs:
shell: cmd
- name: Move PyOpenGL package
run: mv pyopengl-${{env.PYOPENGL_VER}}/* ./
- uses: pypa/cibuildwheel@v2.21.3
- uses: pypa/cibuildwheel@v2.22.0
env:
CIBW_ARCHS_WINDOWS: AMD64
- uses: actions/upload-artifact@v4
Expand All @@ -64,7 +64,7 @@ jobs:
shell: cmd
- name: Move PyOpenGL package
run: mv pyopengl-${{env.PYOPENGL_VER}}/* ./
- uses: pypa/cibuildwheel@v2.21.3
- uses: pypa/cibuildwheel@v2.22.0
env:
CIBW_ARCHS_WINDOWS: x86
- uses: actions/upload-artifact@v4
Expand All @@ -82,8 +82,10 @@ jobs:
- run: download.cmd
shell: cmd
- name: Move PyOpenGL-accelerate package
run: mv pyopengl-${{env.PYOPENGL_VER}}/accelerate/* ./
- uses: pypa/[email protected]
run: |
rm ./README.md
mv pyopengl-${{env.PYOPENGL_VER}}/accelerate/* ./
- uses: pypa/[email protected]
env:
CIBW_ARCHS_WINDOWS: AMD64 x86
- uses: actions/upload-artifact@v4
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ The wheels can be downloaded from the [Releases](https://github.com/cgohlke/pyop

Install the wheels on the command line, for example for Python 3.13 64-bit:

py.exe -3.13 -m pip install PyOpenGL-3.1.8-cp313-cp313-win_amd64.whl
py.exe -3.13 -m pip install PyOpenGL_accelerate-3.1.8-cp313-cp313-win_amd64.whl
py.exe -3.13 -m pip install PyOpenGL-3.1.9-cp313-cp313-win_amd64.whl
py.exe -3.13 -m pip install PyOpenGL_accelerate-3.1.9-cp313-cp313-win_amd64.whl
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@echo on
setlocal

:: set PYOPENGL_VER=release-3.1.8
:: set PYOPENGL_VER=release-3.1.9
:: set FREEGLUT_VER=v3.6.0
:: set GLE_VER=3.1.0

Expand Down
5 changes: 3 additions & 2 deletions download.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
@echo on
setlocal

:: set PYOPENGL_VER=release-3.1.8
:: set PYOPENGL_VER=release-3.1.9
set PYOPENGL_DIR=pyopengl-%PYOPENGL_VER%

curl -L -o %PYOPENGL_VER%.tar.gz https://github.com/mcfletch/pyopengl/archive/refs/tags/%PYOPENGL_VER%.tar.gz
curl -L -o %PYOPENGL_VER%.tar.gz https://github.com/cgohlke/pyopengl/archive/refs/tags/%PYOPENGL_VER%.tar.gz
:: curl -L -o %PYOPENGL_VER%.tar.gz https://github.com/mcfletch/pyopengl/archive/refs/tags/%PYOPENGL_VER%.tar.gz
if errorlevel 1 exit /B 1

tar -xf %PYOPENGL_VER%.tar.gz
Expand Down
29 changes: 0 additions & 29 deletions pyopengl.diff
Original file line number Diff line number Diff line change
@@ -1,36 +1,7 @@
diff --git a/OpenGL/version.py b/OpenGL/version.py
index cf5d50f..6ba9a20 100644
--- a/OpenGL/version.py
+++ b/OpenGL/version.py
@@ -1,2 +1,2 @@
"""Declares the current version for use in setuptools and the like"""
-__version__ = "3.1.7"
+__version__ = "3.1.8"
diff --git a/accelerate/OpenGL_accelerate/__init__.py b/accelerate/OpenGL_accelerate/__init__.py
index 692bad1..f227655 100644
--- a/accelerate/OpenGL_accelerate/__init__.py
+++ b/accelerate/OpenGL_accelerate/__init__.py
@@ -6,5 +6,5 @@ wrapper mechanism. The source code is part of the
PyOpenGL package and is built via the setupaccel.py
script in the top level of the PyOpenGL source package.
"""
-__version__ = "3.1.7"
-__version_tuple__ = (3, 1, 7)
+__version__ = "3.1.8"
+__version_tuple__ = (3, 1, 8)
diff --git a/setup.py b/setup.py
index 9c99241..cfec6bd 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
"""PyOpenGL setup script distutils/setuptools/pip based"""
import sys, os
-from distutils.core import setup
+from setuptools import setup
from distutils.command.install_data import install_data

extra_commands = {}
@@ -45,4 +45,5 @@ if __name__ == "__main__":
},
data_files=datafiles,
Expand Down

0 comments on commit 23d56dc

Please sign in to comment.