From cea8abd4282dd1dba5b0ecb0830bd43acb2d5e0e Mon Sep 17 00:00:00 2001 From: Jan Date: Mon, 8 Jan 2024 22:13:38 +0100 Subject: [PATCH] Rename package (#9) * Rename package * Fix imports --- examples/shadertoy_blink.py | 2 +- examples/shadertoy_circuits.py | 2 +- examples/shadertoy_flyby.py | 2 +- examples/shadertoy_gen_art.py | 2 +- examples/shadertoy_glsl_clock.py | 2 +- examples/shadertoy_glsl_flame.py | 2 +- examples/shadertoy_glsl_fuji.py | 2 +- examples/shadertoy_glsl_inercia.py | 2 +- examples/shadertoy_glsl_mouse_event.py | 2 +- examples/shadertoy_glsl_sdf.py | 2 +- examples/shadertoy_glsl_sea.py | 2 +- examples/shadertoy_glsl_stone.py | 2 +- examples/shadertoy_glsl_textures.py | 2 +- examples/shadertoy_liberation.py | 2 +- examples/shadertoy_matrix.py | 2 +- examples/shadertoy_riders.py | 2 +- examples/shadertoy_sea.py | 2 +- examples/shadertoy_star.py | 2 +- examples/shadertoy_textures.py | 2 +- pyproject.toml | 4 ++-- setup.cfg | 2 +- tests/test_util_shadertoy.py | 8 ++++---- {shadertoy => wgpu_shadertoy}/__init__.py | 0 {shadertoy => wgpu_shadertoy}/shadertoy.py | 0 24 files changed, 26 insertions(+), 26 deletions(-) rename {shadertoy => wgpu_shadertoy}/__init__.py (100%) rename {shadertoy => wgpu_shadertoy}/shadertoy.py (100%) diff --git a/examples/shadertoy_blink.py b/examples/shadertoy_blink.py index 8e04f28..5c811ff 100644 --- a/examples/shadertoy_blink.py +++ b/examples/shadertoy_blink.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_circuits.py b/examples/shadertoy_circuits.py index 1c49ab8..39fbff4 100644 --- a/examples/shadertoy_circuits.py +++ b/examples/shadertoy_circuits.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_flyby.py b/examples/shadertoy_flyby.py index 62f5348..5224011 100644 --- a/examples/shadertoy_flyby.py +++ b/examples/shadertoy_flyby.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_gen_art.py b/examples/shadertoy_gen_art.py index c48c1b9..409d9cd 100644 --- a/examples/shadertoy_gen_art.py +++ b/examples/shadertoy_gen_art.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_glsl_clock.py b/examples/shadertoy_glsl_clock.py index 21ee515..5be2963 100644 --- a/examples/shadertoy_glsl_clock.py +++ b/examples/shadertoy_glsl_clock.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ // source: https://www.shadertoy.com/view/MdVcRd diff --git a/examples/shadertoy_glsl_flame.py b/examples/shadertoy_glsl_flame.py index b734f33..a96215c 100644 --- a/examples/shadertoy_glsl_flame.py +++ b/examples/shadertoy_glsl_flame.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_glsl_fuji.py b/examples/shadertoy_glsl_fuji.py index ffae0f8..4c786a4 100644 --- a/examples/shadertoy_glsl_fuji.py +++ b/examples/shadertoy_glsl_fuji.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_glsl_inercia.py b/examples/shadertoy_glsl_inercia.py index f4a2867..4c6bb0f 100644 --- a/examples/shadertoy_glsl_inercia.py +++ b/examples/shadertoy_glsl_inercia.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_glsl_mouse_event.py b/examples/shadertoy_glsl_mouse_event.py index 99f72f5..51a61de 100644 --- a/examples/shadertoy_glsl_mouse_event.py +++ b/examples/shadertoy_glsl_mouse_event.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_glsl_sdf.py b/examples/shadertoy_glsl_sdf.py index b83f8b4..9f22c3e 100644 --- a/examples/shadertoy_glsl_sdf.py +++ b/examples/shadertoy_glsl_sdf.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_glsl_sea.py b/examples/shadertoy_glsl_sea.py index 3af145f..712d843 100644 --- a/examples/shadertoy_glsl_sea.py +++ b/examples/shadertoy_glsl_sea.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_glsl_stone.py b/examples/shadertoy_glsl_stone.py index b63da6a..e25a5dc 100644 --- a/examples/shadertoy_glsl_stone.py +++ b/examples/shadertoy_glsl_stone.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_glsl_textures.py b/examples/shadertoy_glsl_textures.py index f7c1a2a..750cc15 100644 --- a/examples/shadertoy_glsl_textures.py +++ b/examples/shadertoy_glsl_textures.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy, ShadertoyChannel +from wgpu_shadertoy import Shadertoy, ShadertoyChannel shader_code = """ void mainImage( out vec4 fragColor, in vec2 fragCoord ) diff --git a/examples/shadertoy_liberation.py b/examples/shadertoy_liberation.py index ab2add7..1dbf162 100644 --- a/examples/shadertoy_liberation.py +++ b/examples/shadertoy_liberation.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_matrix.py b/examples/shadertoy_matrix.py index 1437666..7d69051 100644 --- a/examples/shadertoy_matrix.py +++ b/examples/shadertoy_matrix.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_riders.py b/examples/shadertoy_riders.py index f710def..e28e475 100644 --- a/examples/shadertoy_riders.py +++ b/examples/shadertoy_riders.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_sea.py b/examples/shadertoy_sea.py index df54f7d..16e8f9b 100644 --- a/examples/shadertoy_sea.py +++ b/examples/shadertoy_sea.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_star.py b/examples/shadertoy_star.py index bcd1556..1117711 100644 --- a/examples/shadertoy_star.py +++ b/examples/shadertoy_star.py @@ -1,5 +1,5 @@ # test_example = true -from shadertoy import Shadertoy +from wgpu_shadertoy import Shadertoy shader_code = """ diff --git a/examples/shadertoy_textures.py b/examples/shadertoy_textures.py index 8b1a279..948012c 100644 --- a/examples/shadertoy_textures.py +++ b/examples/shadertoy_textures.py @@ -1,4 +1,4 @@ -from shadertoy import Shadertoy, ShadertoyChannel +from wgpu_shadertoy import Shadertoy, ShadertoyChannel shader_code_wgsl = """ fn shader_main(frag_coord: vec2) -> vec4{ diff --git a/pyproject.toml b/pyproject.toml index 214e367..db1359b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ requires = [ build-backend = "setuptools.build_meta" [project] -name = "shadertoy" +name = "wgpu-shadertoy" dynamic = ["version", "readme"] dependencies = [ "wgpu>=0.13.2,<0.14.0", @@ -39,5 +39,5 @@ dev = [ ] [tool.setuptools.dynamic] -version = {attr = "shadertoy.__version__"} +version = {attr = "wgpu_shadertoy.__version__"} readme = {file = ["README.md"]} diff --git a/setup.cfg b/setup.cfg index 9a45c97..cc7b178 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,7 +15,7 @@ extend-ignore = E501, E203, B006, B007, D per-file-ignores = examples/*.py: F821,F722 - shadertoy/__init__.py: F401 + wgpu_shadertoy/__init__.py: F401 [coverage:report] diff --git a/tests/test_util_shadertoy.py b/tests/test_util_shadertoy.py index bf99040..f3593b1 100644 --- a/tests/test_util_shadertoy.py +++ b/tests/test_util_shadertoy.py @@ -19,7 +19,7 @@ def force_offscreen(): def test_shadertoy_wgsl(): # Import here, because it imports the wgpu.gui.auto - from shadertoy import Shadertoy # noqa + from wgpu_shadertoy import Shadertoy # noqa shader_code = """ fn shader_main(frag_coord: vec2) -> vec4 { @@ -44,7 +44,7 @@ def test_shadertoy_wgsl(): def test_shadertoy_glsl(): # Import here, because it imports the wgpu.gui.auto - from shadertoy import Shadertoy # noqa + from wgpu_shadertoy import Shadertoy # noqa shader_code = """ void shader_main(out vec4 fragColor, vec2 frag_coord) { @@ -69,7 +69,7 @@ def test_shadertoy_glsl(): def test_shadertoy_offscreen(): # Import here, because it imports the wgpu.gui.auto - from shadertoy import Shadertoy # noqa + from wgpu_shadertoy import Shadertoy # noqa shader_code = """ void shader_main(out vec4 fragColor, vec2 frag_coord) { @@ -93,7 +93,7 @@ def test_shadertoy_offscreen(): def test_shadertoy_snapshot(): # Import here, because it imports the wgpu.gui.auto - from shadertoy import Shadertoy # noqa + from wgpu_shadertoy import Shadertoy # noqa shader_code = """ void shader_main(out vec4 fragColor, vec2 frag_coord) { diff --git a/shadertoy/__init__.py b/wgpu_shadertoy/__init__.py similarity index 100% rename from shadertoy/__init__.py rename to wgpu_shadertoy/__init__.py diff --git a/shadertoy/shadertoy.py b/wgpu_shadertoy/shadertoy.py similarity index 100% rename from shadertoy/shadertoy.py rename to wgpu_shadertoy/shadertoy.py