From 01f6d95cb22004a4a270618351cc5ca2b4e141fb Mon Sep 17 00:00:00 2001 From: kushalkolar Date: Mon, 2 Oct 2023 17:50:02 -0400 Subject: [PATCH 1/2] vertex_colors -> color_mode='vertex' --- fastplotlib/graphics/line.py | 2 +- fastplotlib/graphics/scatter.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fastplotlib/graphics/line.py b/fastplotlib/graphics/line.py index fb7e38e62..d6f061ab0 100644 --- a/fastplotlib/graphics/line.py +++ b/fastplotlib/graphics/line.py @@ -114,7 +114,7 @@ def __init__( world_object: pygfx.Line = pygfx.Line( # self.data.feature_data because data is a Buffer geometry=pygfx.Geometry(positions=self.data(), colors=self.colors()), - material=material(thickness=self.thickness(), vertex_colors=True), + material=material(thickness=self.thickness(), color_mode="vertex"), ) self._set_world_object(world_object) diff --git a/fastplotlib/graphics/scatter.py b/fastplotlib/graphics/scatter.py index 141db2af3..961324c23 100644 --- a/fastplotlib/graphics/scatter.py +++ b/fastplotlib/graphics/scatter.py @@ -91,7 +91,7 @@ def __init__( world_object = pygfx.Points( pygfx.Geometry(positions=self.data(), sizes=self.sizes(), colors=self.colors()), - material=pygfx.PointsMaterial(vertex_colors=True, vertex_sizes=True), + material=pygfx.PointsMaterial(color_mode="vertex", vertex_sizes=True), ) self._set_world_object(world_object) From b86832a044ffb532f2c72de3657536a184980a22 Mon Sep 17 00:00:00 2001 From: kushalkolar Date: Mon, 2 Oct 2023 18:20:11 -0400 Subject: [PATCH 2/2] update ci to use pygfx@main instead of a specific commit --- .github/workflows/ci.yml | 4 ++-- .github/workflows/screenshots.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3abcfaaf0..85731e381 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: python -m pip install --upgrade pip # remove pygfx from requirements, we install a specific commit of pygfx since both fpl and pygfx are fast evolving sed -i "/pygfx/d" ./setup.py - pip install git+https://github.com/pygfx/pygfx.git@cf1da6c32223ba3cf7256982ce9b89c81b593076 + pip install git+https://github.com/pygfx/pygfx.git@main pip install -e ".[notebook,docs,tests]" - name: Build docs run: | @@ -78,7 +78,7 @@ jobs: python -m pip install --upgrade pip # remove pygfx from requirements, we install a specific commit of pygfx since both fpl and pygfx are fast evolving sed -i "/pygfx/d" ./setup.py - pip install git+https://github.com/pygfx/pygfx.git@cf1da6c32223ba3cf7256982ce9b89c81b593076 + pip install git+https://github.com/pygfx/pygfx.git@main pip install -e ".["tests"]" - name: Show wgpu backend run: diff --git a/.github/workflows/screenshots.yml b/.github/workflows/screenshots.yml index 488ad108f..5e274da83 100644 --- a/.github/workflows/screenshots.yml +++ b/.github/workflows/screenshots.yml @@ -33,7 +33,7 @@ jobs: python -m pip install --upgrade pip # remove pygfx from requirements, we install a specific commit of pygfx since both fpl and pygfx are fast evolving sed -i "/pygfx/d" ./setup.py - pip install git+https://github.com/pygfx/pygfx.git@b63f22a1aa61993c32cd96895316cb8248a81e4d + pip install git+https://github.com/pygfx/pygfx.git@main pip install -e ".["tests"]" - name: Show wgpu backend run: