Content-Length: 1274183 | pFad | http://github.com/fastplotlib/fastplotlib/commit/07053e73264b6f72b4d44b10dacd2143ba60f69d

C9 updates related to upstream changes (#687) · fastplotlib/fastplotlib@07053e7 · GitHub
Skip to content

Commit 07053e7

Browse files
kushalkolarjcafhe
andauthored
updates related to upstream changes (#687)
* use imageio[ffmpeg] instead of pyav (#686) * fix typo in the requested limit name of the wgpu device (#679) * fix typo in the requested limit name of the wgpu device. * fix test config. * fix examples/test and docs * fix max-texture-dimension-2d limit name and replace underscore by hyphen for the other limits. * fix missing dependency (libxrandr) to compile GLFW during building wheel for imgui-bundle. * update CI timeout * update timeout in non-nb test job --------- Co-authored-by: Kushal Kolar <kushalkolar@gmail.com> * update to use pygfx.TextureMap * forgot to set imageio[ffmpeg] for all extras * migrate to RenderCanvas, remove event_filter stuff for imgui since that was fixed in pygfx * remove very old irrelevant example * fix docstring * update examples to use fpl.loop.run() * update API docs * black * import ImageWidget only if imgui is installed * enumerate_adapters() -> enumerate_adapters_sync() * remove annoying warnings from cmap * remove more cmap warnings * black --------- Co-authored-by: Jérémie Fache <jeremie.fache@netcourrier.com>
1 parent f0f80c6 commit 07053e7

File tree

85 files changed

+281
-296
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+281
-296
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
test-build-full:
1818
name: Test Linux, notebook + offscreen
1919
runs-on: ubuntu-latest
20-
timeout-minutes: 10
20+
timeout-minutes: 30
2121
if: ${{ !github.event.pull_request.draft }}
2222
strategy:
2323
fail-fast: false
@@ -40,7 +40,7 @@ jobs:
4040
- name: Install llvmpipe and lavapipe for offscreen canvas
4141
run: |
4242
sudo apt-get update -y -qq
43-
sudo apt-get install --no-install-recommends -y ffmpeg libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
43+
sudo apt-get install --no-install-recommends -y ffmpeg libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers xorg-dev
4444
- name: Install dev dependencies
4545
run: |
4646
python -m pip install --upgrade pip setuptools
@@ -73,7 +73,7 @@ jobs:
7373
test-build-offscreen:
7474
name: Test Linux, only offscreen
7575
runs-on: ubuntu-latest
76-
timeout-minutes: 10
76+
timeout-minutes: 30
7777
if: ${{ !github.event.pull_request.draft }}
7878
strategy:
7979
fail-fast: false
@@ -96,7 +96,7 @@ jobs:
9696
- name: Install llvmpipe and lavapipe for offscreen canvas
9797
run: |
9898
sudo apt-get update -y -qq
99-
sudo apt-get install --no-install-recommends -y libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
99+
sudo apt-get install --no-install-recommends -y libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers xorg-dev
100100
- name: Install dev dependencies
101101
run: |
102102
python -m pip install --upgrade pip setuptools

docs/source/api/fastplotlib.rst

Lines changed: 3 additions & 1 deletion

docs/source/api/ui/Popup.rst

Lines changed: 0 additions & 2 deletions

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import imageio.v3 as iio
1919

2020
MAX_TEXTURE_SIZE = 2048
21-
pygfx.renderers.wgpu.set_wgpu_limits(**{"max-texture-dimension2d": MAX_TEXTURE_SIZE})
21+
pygfx.renderers.wgpu.set_wgpu_limits(**{"max-texture-dimension-2d": MAX_TEXTURE_SIZE})
2222

2323
ROOT_DIR = Path(__file__).parents[1].parents[0] # repo root
2424
EXAMPLES_DIR = Path.joinpath(ROOT_DIR, "examples")

docs/source/generate_api.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151

5252
".. autofunction:: fastplotlib.print_wgpu_report\n\n"
5353

54-
".. autofunction:: fastplotlib.run\n"
54+
"fastplotlib.loop\n"
55+
"------------------\n"
56+
"See the rendercanvas docs: https://rendercanvas.readthedocs.io/stable/api.html#rendercanvas.BaseLoop "
5557
)
5658

5759
with open(API_DIR.joinpath("utils.rst"), "w") as f:

docs/source/user_guide/gpu.rst

Lines changed: 32 additions & 32 deletions

examples/gridplot/gridplot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030
# please see our docs for using fastplotlib interactively in ipython and jupyter
3131
if __name__ == "__main__":
3232
print(__doc__)
33-
fpl.run()
33+
fpl.loop.run()

examples/gridplot/gridplot_non_square.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@
2828
# please see our docs for using fastplotlib interactively in ipython and jupyter
2929
if __name__ == "__main__":
3030
print(__doc__)
31-
fpl.run()
31+
fpl.loop.run()

examples/gridplot/multigraphic_gridplot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,5 +114,5 @@ def make_circle(center, radius: float, n_points: int = 75) -> np.ndarray:
114114
# please see our docs for using fastplotlib interactively in ipython and jupyter
115115
if __name__ == "__main__":
116116
print(__doc__)
117-
fpl.run()
117+
fpl.loop.run()
118118

examples/guis/image_widget_imgui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,4 @@ def process_image(self):
7979
# please see our docs for using fastplotlib interactively in ipython and jupyter
8080
if __name__ == "__main__":
8181
print(__doc__)
82-
fpl.run()
82+
fpl.loop.run()

examples/guis/imgui_basic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,4 @@ def _set_data(self):
120120
# please see our docs for using fastplotlib interactively in ipython and jupyter
121121
if __name__ == "__main__":
122122
print(__doc__)
123-
fpl.run()
123+
fpl.loop.run()

examples/heatmap/heatmap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030
# please see our docs for using fastplotlib interactively in ipython and jupyter
3131
if __name__ == "__main__":
3232
print(__doc__)
33-
fpl.run()
33+
fpl.loop.run()

examples/image/image_cmap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@
2626
# please see our docs for using fastplotlib interactively in ipython and jupyter
2727
if __name__ == "__main__":
2828
print(__doc__)
29-
fpl.run()
29+
fpl.loop.run()

examples/image/image_rgb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@
2525
# please see our docs for using fastplotlib interactively in ipython and jupyter
2626
if __name__ == "__main__":
2727
print(__doc__)
28-
fpl.run()
28+
fpl.loop.run()

examples/image/image_rgbvminvmax.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@
2727
# please see our docs for using fastplotlib interactively in ipython and jupyter
2828
if __name__ == "__main__":
2929
print(__doc__)
30-
fpl.run()
30+
fpl.loop.run()

examples/image/image_simple.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@
2525
# please see our docs for using fastplotlib interactively in ipython and jupyter
2626
if __name__ == "__main__":
2727
print(__doc__)
28-
fpl.run()
28+
fpl.loop.run()

examples/image/image_small.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@
2727
# please see our docs for using fastplotlib interactively in ipython and jupyter
2828
if __name__ == "__main__":
2929
print(__doc__)
30-
fpl.run()
30+
fpl.loop.run()

examples/image/image_vminvmax.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@
2727
# please see our docs for using fastplotlib interactively in ipython and jupyter
2828
if __name__ == "__main__":
2929
print(__doc__)
30-
fpl.run()
30+
fpl.loop.run()

examples/image_widget/image_widget.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
# test_example = true
1212
# sphinx_gallery_pygfx_docs = 'screenshot'
13-
13+
import glfw
1414
import fastplotlib as fpl
1515
import imageio.v3 as iio # not a fastplotlib dependency, only used for examples
1616

@@ -31,4 +31,4 @@
3131
# please see our docs for using fastplotlib interactively in ipython and jupyter
3232
if __name__ == "__main__":
3333
print(__doc__)
34-
fpl.run()
34+
fpl.loop.run()

examples/image_widget/image_widget_grid.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@
3838
# please see our docs for using fastplotlib interactively in ipython and jupyter
3939
if __name__ == "__main__":
4040
print(__doc__)
41-
fpl.run()
41+
fpl.loop.run()

examples/image_widget/image_widget_single_video.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@
4444
# please see our docs for using fastplotlib interactively in ipython and jupyter
4545
if __name__ == "__main__":
4646
print(__doc__)
47-
fpl.run()
47+
fpl.loop.run()

examples/image_widget/image_widget_videos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@
4040
# please see our docs for using fastplotlib interactively in ipython and jupyter
4141
if __name__ == "__main__":
4242
print(__doc__)
43-
fpl.run()
43+
fpl.loop.run()

examples/line/line.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@
4444
# please see our docs for using fastplotlib interactively in ipython and jupyter
4545
if __name__ == "__main__":
4646
print(__doc__)
47-
fpl.run()
47+
fpl.loop.run()

examples/line/line_cmap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@
4646
# please see our docs for using fastplotlib interactively in ipython and jupyter
4747
if __name__ == "__main__":
4848
print(__doc__)
49-
fpl.run()
49+
fpl.loop.run()

examples/line/line_cmap_more.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@
5353
# please see our docs for using fastplotlib interactively in ipython and jupyter
5454
if __name__ == "__main__":
5555
print(__doc__)
56-
fpl.run()
56+
fpl.loop.run()

examples/line/line_colorslice.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@
8787
# please see our docs for using fastplotlib interactively in ipython and jupyter
8888
if __name__ == "__main__":
8989
print(__doc__)
90-
fpl.run()
90+
fpl.loop.run()

examples/line/line_dataslice.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@
5151
# please see our docs for using fastplotlib interactively in ipython and jupyter
5252
if __name__ == "__main__":
5353
print(__doc__)
54-
fpl.run()
54+
fpl.loop.run()

examples/line_collection/line_collection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ def make_circle(center, radius: float, n_points: int = 75) -> np.ndarray:
4343
# please see our docs for using fastplotlib interactively in ipython and jupyter
4444
if __name__ == "__main__":
4545
print(__doc__)
46-
fpl.run()
46+
fpl.loop.run()

examples/line_collection/line_collection_cmap_values.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ def make_circle(center, radius: float, n_points: int = 75) -> np.ndarray:
5050
# please see our docs for using fastplotlib interactively in ipython and jupyter
5151
if __name__ == "__main__":
5252
print(__doc__)
53-
fpl.run()
53+
fpl.loop.run()

examples/line_collection/line_collection_cmap_values_qualitative.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ def make_circle(center, radius: float, n_points: int = 75) -> np.ndarray:
6060
# please see our docs for using fastplotlib interactively in ipython and jupyter
6161
if __name__ == "__main__":
6262
print(__doc__)
63-
fpl.run()
63+
fpl.loop.run()

examples/line_collection/line_collection_colors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ def make_circle(center, radius: float, n_points: int = 75) -> np.ndarray:
4747
# please see our docs for using fastplotlib interactively in ipython and jupyter
4848
if __name__ == "__main__":
4949
print(__doc__)
50-
fpl.run()
50+
fpl.loop.run()

examples/line_collection/line_collection_slicing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@
7575

7676
if __name__ == "__main__":
7777
print(__doc__)
78-
fpl.run()
78+
fpl.loop.run()

examples/line_collection/line_stack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@
3535
# please see our docs for using fastplotlib interactively in ipython and jupyter
3636
if __name__ == "__main__":
3737
print(__doc__)
38-
fpl.run()
38+
fpl.loop.run()

examples/line_collection/line_stack_3d.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,4 @@ def animate_colors(subplot):
105105
# please see our docs for using fastplotlib interactively in ipython and jupyter
106106
if __name__ == "__main__":
107107
print(__doc__)
108-
fpl.run()
108+
fpl.loop.run()

examples/machine_learning/covariance.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,4 @@ def animate():
9191
# please see our docs for using fastplotlib interactively in ipython and jupyter
9292
if __name__ == "__main__":
9393
print(__doc__)
94-
fpl.run()
94+
fpl.loop.run()

examples/misc-dev/large_img.py

Lines changed: 0 additions & 35 deletions
This file was deleted.

examples/misc/cycle_animation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ def cycle_colors(subplot):
5858
# please see our docs for using fastplotlib interactively in ipython and jupyter
5959
if __name__ == "__main__":
6060
print(__doc__)
61-
fpl.run()
61+
fpl.loop.run()

examples/misc/em_wave_animation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,4 @@ def tick(subplot):
112112
# please see our docs for using fastplotlib interactively in ipython and jupyter
113113
if __name__ == "__main__":
114114
print(__doc__)
115-
fpl.run()
115+
fpl.loop.run()

examples/misc/image_animation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ def update_data(figure_instance):
3434
# please see our docs for using fastplotlib interactively in ipython and jupyter
3535
if __name__ == "__main__":
3636
print(__doc__)
37-
fpl.run()
37+
fpl.loop.run()

examples/misc/line3d_animation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ def move_marker():
5858
# please see our docs for using fastplotlib interactively in ipython and jupyter
5959
if __name__ == "__main__":
6060
print(__doc__)
61-
fpl.run()
61+
fpl.loop.run()

examples/misc/line_animation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ def update_line(subplot):
4747
# please see our docs for using fastplotlib interactively in ipython and jupyter
4848
if __name__ == "__main__":
4949
print(__doc__)
50-
fpl.run()
50+
fpl.loop.run()

0 commit comments

Comments
 (0)








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/fastplotlib/fastplotlib/commit/07053e73264b6f72b4d44b10dacd2143ba60f69d

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy