Skip to content

Commit

Permalink
bump to version 1.15.0
Browse files Browse the repository at this point in the history
  • Loading branch information
szabolcsdombi committed Oct 8, 2023
1 parent 0f20cfa commit 9dfba44
Show file tree
Hide file tree
Showing 14 changed files with 50 additions and 45 deletions.
64 changes: 32 additions & 32 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
@@ -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
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
copyright = '2022, Szabolcs Dombi'
author = 'Szabolcs Dombi'

release = '1.14.0'
release = '1.15.0'

extensions = []
templates_path = []
Expand Down
2 changes: 1 addition & 1 deletion examples/webgl/public/blend.html
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]);
Expand Down
2 changes: 1 addition & 1 deletion examples/webgl/public/box_grid.html
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]);
Expand Down
2 changes: 1 addition & 1 deletion examples/webgl/public/game_of_life.html
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]);
Expand Down
2 changes: 1 addition & 1 deletion examples/webgl/public/hello_triangle.html
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]);
Expand Down
2 changes: 1 addition & 1 deletion examples/webgl/public/julia_fractal.html
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]);
Expand Down
2 changes: 1 addition & 1 deletion examples/webgl/public/rigged_objects.html
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion examples/webgl/public/textured_crate.html
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion examples/webgl/public/zengl_logo.html
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]);
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

setup(
name='zengl',
version='1.14.0',
version='1.15.0',
ext_modules=[ext],
py_modules=['_zengl'],
license='MIT',
Expand Down
2 changes: 1 addition & 1 deletion zengl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion zengl_web.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit 9dfba44

Please sign in to comment.