<Update>[Pygame 2.0.0]: <Upgrade>

Cannot support OpenGL

[#65]

Author: hasii2011

.gitignore

@@ -1,13 +1,12 @@
 .idea/
 __pycache__/
 .DS_Store
-.python-version
 /html/
 /build/
 /dist/
 /python3_albow.egg-info/
 /site/
 /docs/
-/venv-pyenv-3.7.7/
+/venv-pyenv-3.9.0/
 /venv-pyenv-3.8.5/
 

albow/core/ui/RootWidget.py

@@ -21,7 +21,7 @@
 from pygame.event import set_grab
 
 from pygame.locals import USEREVENT
-from pygame.locals import OPENGL
+# from pygame.locals import OPENGL
 
 from albow.core.ui.Widget import Widget
 
@@ -99,8 +99,9 @@ def __init__(self, surface: Surface, **kwds):
         RootWidget.root_widget = self
         Widget.root_widget = self
 
-        self.is_gl = surface.get_flags() & OPENGL != 0
-        # RootWidget.classLogger.info(f"self.is_gl: {self.is_gl}")
+        # self.is_gl = surface.get_flags() & OPENGL != 0
+        self.is_gl: bool = False    # in pygame 2.0.0 I cannot support Open GL
+        RootWidget.classLogger.info(f"self.is_gl: {self.is_gl}")
         if self.is_gl:
 
             from albow.openGL.GLSurface import GLSurface

albow/demo/loggingConfiguration.json

@@ -21,24 +21,16 @@
     "loggers": {
         "root": {
             "level": "INFO",
-            "handlers": [
-                "consoleHandler"
-            ],
+            "handlers": ["consoleHandler"],
             "propagate": "0"
         },
         "albow": {
             "level": "INFO",
-            "handlers": [
-                "consoleHandler"
-            ],
             "propagate": "False"
         },
         "__main__": {
             "level": "INFO",
-            "handlers": [
-                "consoleHandler"
-            ],
             "propagate": "False"
         }
     }
-}
+}

albow/openGL/GLOrtho.py

@@ -1,6 +1,7 @@
 
 from pygame import Rect
 
+# noinspection PyPackageRequirements
 from OpenGL import GL
 
 from albow.openGL.GLViewport import GLViewport

albow/openGL/GLPerspective.py

@@ -1,6 +1,7 @@
 
 from pygame import Rect
 
+# noinspection PyPackageRequirements
 from OpenGL import GLU
 
 from albow.openGL.GLViewport import GLViewport

albow/openGL/GLSurface.py

@@ -2,7 +2,9 @@
 from pygame import Rect
 from pygame import image
 
+# noinspection PyPackageRequirements
 from OpenGL import GL
+# noinspection PyPackageRequirements
 from OpenGL import GLU
 
 

albow/openGL/GLViewport.py

@@ -3,7 +3,9 @@
 
 from pygame.display import get_surface as get_display
 
+# noinspection PyPackageRequirements
 from OpenGL import GL
+# noinspection PyPackageRequirements
 from OpenGL import GLU
 
 from albow.core.ui.Widget import Widget

requirements.txt

@@ -1,2 +1,6 @@
-pygame==2.0.0.dev10
-jsonpickle==1.4.1
+pygame==2.0.0
+PyOpenGL==3.1.5
+PyOpenGL_accelerate==3.1.5
+wheel==0.35.1
+setuptools==50.3.2
+twine==3.2.0

scripts/packageme.sh

@@ -15,8 +15,8 @@ changeToProjectRoot
 
 clear
 
-source venv-albow-Python-3.8.5/bin/activate
-./cleanup.sh
+source venv-pyenv-3.8.5/bin/activate
+./scripts/cleanup.sh
 python3 setup.py sdist bdist_wheel
 
 # Check package

setup.py

@@ -10,12 +10,14 @@
 
 setup(
     name="python3-albow",
-    version="2.80",
+    version="2.86",
+    author='Humberto A. Sanchez II',
+    author_email='[email protected]',
     description="A Little Bit of Widgetry for PyGame",
     long_description=README,
     long_description_content_type="text/markdown",
     url="https://hasii2011.github.io",
     packages=find_packages(),
     include_package_data=True,
-    install_requires=["pygame"]
+    install_requires=['pygame', 'PyOpenGL', 'PyOpenGL-accelerate']
 )