From 9dfba447d6eb72558169e4447f4b6d6e2b76812a Mon Sep 17 00:00:00 2001 From: Szabolcs Dombi Date: Sun, 8 Oct 2023 22:48:07 +0300 Subject: [PATCH] bump to version 1.15.0 --- .github/workflows/pages.yml | 64 +++++++++++------------ CHANGELOG.md | 7 ++- docs/conf.py | 2 +- examples/webgl/public/blend.html | 2 +- examples/webgl/public/box_grid.html | 2 +- examples/webgl/public/game_of_life.html | 2 +- examples/webgl/public/hello_triangle.html | 2 +- examples/webgl/public/julia_fractal.html | 2 +- examples/webgl/public/rigged_objects.html | 2 +- examples/webgl/public/textured_crate.html | 2 +- examples/webgl/public/zengl_logo.html | 2 +- setup.py | 2 +- zengl.c | 2 +- zengl_web.c | 2 +- 14 files changed, 50 insertions(+), 45 deletions(-) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 99b33ad1..8eafad7d 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -1,37 +1,37 @@ -name: pages +# name: pages -on: - push: - branches: ["main"] +# on: +# push: +# branches: ["main"] - workflow_dispatch: +# workflow_dispatch: -permissions: - contents: read - pages: write - id-token: write +# permissions: +# contents: read +# pages: write +# id-token: write -concurrency: - group: "pages" - cancel-in-progress: false +# concurrency: +# group: "pages" +# cancel-in-progress: false -jobs: - deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Build - run: docker build . -f examples/webgl/Dockerfile -t build && docker run --rm -v `pwd`/pages:/pages build cp -r /web /pages/ - - name: Setup Pages - uses: actions/configure-pages@v3 - - name: Upload artifact - uses: actions/upload-pages-artifact@v1 - with: - path: 'pages/web' - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v2 +# jobs: +# deploy: +# environment: +# name: github-pages +# url: ${{ steps.deployment.outputs.page_url }} +# runs-on: ubuntu-latest +# steps: +# - name: Checkout +# uses: actions/checkout@v3 +# - name: Build +# run: docker build . -f examples/webgl/Dockerfile -t build && docker run --rm -v `pwd`/pages:/pages build cp -r /web /pages/ +# - name: Setup Pages +# uses: actions/configure-pages@v3 +# - name: Upload artifact +# uses: actions/upload-pages-artifact@v1 +# with: +# path: 'pages/web' +# - name: Deploy to GitHub Pages +# id: deployment +# uses: actions/deploy-pages@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index a20b5784..8b2a5ecd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -# [main](https://github.com/szabolcsdombi/zengl/compare/1.14.0...main) +# [main](https://github.com/szabolcsdombi/zengl/compare/1.15.0...main) + +# [1.15.0](https://github.com/szabolcsdombi/zengl/compare/1.14.0...1.15.0) + +- Added nativ web support without third party webgl binding +- Fixed default loader for osx # [1.14.0](https://github.com/szabolcsdombi/zengl/compare/1.13.0...1.14.0) diff --git a/docs/conf.py b/docs/conf.py index 6423bc14..ab82b399 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -2,7 +2,7 @@ copyright = '2022, Szabolcs Dombi' author = 'Szabolcs Dombi' -release = '1.14.0' +release = '1.15.0' extensions = [] templates_path = [] diff --git a/examples/webgl/public/blend.html b/examples/webgl/public/blend.html index 32610438..b4a437d7 100644 --- a/examples/webgl/public/blend.html +++ b/examples/webgl/public/blend.html @@ -19,7 +19,7 @@ await pyodide.loadPackage([ 'numpy', - 'zengl-1.14.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', + 'zengl-1.15.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', ]); diff --git a/examples/webgl/public/box_grid.html b/examples/webgl/public/box_grid.html index ee70b32d..4090504d 100644 --- a/examples/webgl/public/box_grid.html +++ b/examples/webgl/public/box_grid.html @@ -18,7 +18,7 @@ const pyodide = await loadPyodide(); await pyodide.loadPackage([ - 'zengl-1.14.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', + 'zengl-1.15.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', ]); diff --git a/examples/webgl/public/game_of_life.html b/examples/webgl/public/game_of_life.html index ef69bc7c..9ed0165a 100644 --- a/examples/webgl/public/game_of_life.html +++ b/examples/webgl/public/game_of_life.html @@ -18,7 +18,7 @@ const pyodide = await loadPyodide(); await pyodide.loadPackage([ - 'zengl-1.14.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', + 'zengl-1.15.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', ]); diff --git a/examples/webgl/public/hello_triangle.html b/examples/webgl/public/hello_triangle.html index 0df3cb87..2c46f0c8 100644 --- a/examples/webgl/public/hello_triangle.html +++ b/examples/webgl/public/hello_triangle.html @@ -18,7 +18,7 @@ const pyodide = await loadPyodide(); await pyodide.loadPackage([ - 'zengl-1.14.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', + 'zengl-1.15.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', ]); diff --git a/examples/webgl/public/julia_fractal.html b/examples/webgl/public/julia_fractal.html index f9471904..3cd58936 100644 --- a/examples/webgl/public/julia_fractal.html +++ b/examples/webgl/public/julia_fractal.html @@ -18,7 +18,7 @@ const pyodide = await loadPyodide(); await pyodide.loadPackage([ - 'zengl-1.14.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', + 'zengl-1.15.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', ]); diff --git a/examples/webgl/public/rigged_objects.html b/examples/webgl/public/rigged_objects.html index 424d5ae7..b24bf338 100644 --- a/examples/webgl/public/rigged_objects.html +++ b/examples/webgl/public/rigged_objects.html @@ -18,7 +18,7 @@ const pyodide = await loadPyodide(); await pyodide.loadPackage([ - 'zengl-1.14.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', + 'zengl-1.15.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'assets-0.1.0-py3-none-any.whl', diff --git a/examples/webgl/public/textured_crate.html b/examples/webgl/public/textured_crate.html index f240cb88..7e33b5d9 100644 --- a/examples/webgl/public/textured_crate.html +++ b/examples/webgl/public/textured_crate.html @@ -18,7 +18,7 @@ const pyodide = await loadPyodide(); await pyodide.loadPackage([ - 'zengl-1.14.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', + 'zengl-1.15.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'assets-0.1.0-py3-none-any.whl', diff --git a/examples/webgl/public/zengl_logo.html b/examples/webgl/public/zengl_logo.html index 43d7e895..8b785efe 100644 --- a/examples/webgl/public/zengl_logo.html +++ b/examples/webgl/public/zengl_logo.html @@ -18,7 +18,7 @@ const pyodide = await loadPyodide(); await pyodide.loadPackage([ - 'zengl-1.14.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', + 'zengl-1.15.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', 'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl', ]); diff --git a/setup.py b/setup.py index f6cf2843..a7d9e19a 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ setup( name='zengl', - version='1.14.0', + version='1.15.0', ext_modules=[ext], py_modules=['_zengl'], license='MIT', diff --git a/zengl.c b/zengl.c index 7cf61d11..f977ec64 100644 --- a/zengl.c +++ b/zengl.c @@ -3399,7 +3399,7 @@ static int module_exec(PyObject * self) { PyModule_AddObject(self, "calcsize", PyObject_GetAttrString(state->helper, "calcsize")); PyModule_AddObject(self, "bind", PyObject_GetAttrString(state->helper, "bind")); - PyModule_AddObject(self, "__version__", PyUnicode_FromString("1.14.0")); + PyModule_AddObject(self, "__version__", PyUnicode_FromString("1.15.0")); return 0; } diff --git a/zengl_web.c b/zengl_web.c index d5c4823f..f15863da 100644 --- a/zengl_web.c +++ b/zengl_web.c @@ -3192,7 +3192,7 @@ static int module_exec(PyObject * self) { PyModule_AddObject(self, "calcsize", PyObject_GetAttrString(state->helper, "calcsize")); PyModule_AddObject(self, "bind", PyObject_GetAttrString(state->helper, "bind")); - PyModule_AddObject(self, "__version__", PyUnicode_FromString("1.14.0")); + PyModule_AddObject(self, "__version__", PyUnicode_FromString("1.15.0")); #ifdef setup_gl PyModule_AddObject(self, "setup_gl", PyUnicode_FromString(setup_gl));