From 49c0dfd0af1a9c0431af17753edb884691396a95 Mon Sep 17 00:00:00 2001 From: Henrique Ferrolho Date: Thu, 10 Oct 2024 16:47:35 +0100 Subject: [PATCH 1/6] Upgrade base Julia version to the LTS (now 1.10) and other changes for Julia 1.11 --- Project.toml | 16 ++++++------ notebooks/Project.toml | 4 +-- notebooks/Static HTML Visualizers.ipynb | 6 ++--- notebooks/animation.ipynb | 33 ++++++++++++++----------- notebooks/demo.ipynb | 6 ++--- test/notebook.jl | 2 +- 6 files changed, 35 insertions(+), 32 deletions(-) diff --git a/Project.toml b/Project.toml index 41f093b..87fece8 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "MeshCat" uuid = "283c5d60-a78f-5afe-a0af-af636b173e11" authors = ["Robin Deits "] -version = "0.16.2" +version = "0.16.3" [deps] Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -33,23 +33,23 @@ DocStringExtensions = "0.5, 0.6, 0.7, 0.8, 0.9" FFMPEG = "0.2, 0.3, 0.4" GeometryBasics = "0.3, 0.4" HTTP = "1" +Meshing = "0.5, 0.6" MeshIO = "0.4" -Meshing = "0.5" MsgPack = "1" -Parameters = "0.10, 0.11, 0.12" +Parameters = "0.10, 0.11, 0.12, 0.13" PrecompileTools = "1" -Requires = "0.5, 1" -Rotations = "1.3" -StaticArrays = "0.10, 0.11, 0.12, 1" +Requires = "1" +Rotations = "1" +StaticArrays = "1" Tar = "1" -julia = "1.6" +julia = "1.10" [extras] ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" Electron = "a1bb12fb-d4d1-54b4-b10a-ee7951ef7ad3" FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -MeshIO = "7269a6da-0436-5bbc-96c2-40638cbb6118" Meshing = "e6723b4c-ebff-59f1-b4b7-d97aa5274f73" +MeshIO = "7269a6da-0436-5bbc-96c2-40638cbb6118" NBInclude = "0db19996-df87-5ea3-a455-e3a50d440464" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" diff --git a/notebooks/Project.toml b/notebooks/Project.toml index 769cf92..4114917 100644 --- a/notebooks/Project.toml +++ b/notebooks/Project.toml @@ -4,13 +4,13 @@ CoordinateTransformations = "150eb455-5306-5404-9cee-2592286d6298" FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326" MeshCat = "283c5d60-a78f-5afe-a0af-af636b173e11" -MeshIO = "7269a6da-0436-5bbc-96c2-40638cbb6118" Meshing = "e6723b4c-ebff-59f1-b4b7-d97aa5274f73" +MeshIO = "7269a6da-0436-5bbc-96c2-40638cbb6118" Rotations = "6038ab10-8711-5258-84ad-4b1120ba62dc" [compat] Colors = "0.9, 0.10, 0.11, 0.12" FileIO = "1" GeometryBasics = "0.3, 0.4" -MeshIO = "0.4" Meshing = "0.5, 0.6" +MeshIO = "0.4" diff --git a/notebooks/Static HTML Visualizers.ipynb b/notebooks/Static HTML Visualizers.ipynb index 9480e7c..ab67350 100644 --- a/notebooks/Static HTML Visualizers.ipynb +++ b/notebooks/Static HTML Visualizers.ipynb @@ -165,15 +165,15 @@ "lastKernelId": null }, "kernelspec": { - "display_name": "Julia 1.10.2", + "display_name": "Julia 1.11.0", "language": "julia", - "name": "julia-1.10" + "name": "julia-1.11" }, "language_info": { "file_extension": ".jl", "mimetype": "application/julia", "name": "julia", - "version": "1.10.2" + "version": "1.11.0" } }, "nbformat": 4, diff --git a/notebooks/animation.ipynb b/notebooks/animation.ipynb index e8105da..e574ef9 100644 --- a/notebooks/animation.ipynb +++ b/notebooks/animation.ipynb @@ -46,22 +46,26 @@ "vis = Visualizer()" ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "There are a few different ways of opening the visualizer:\n", + "- In a new browser tab with `open(vis)`.\n", + "- Inside this jupyter notebook with `render(vis)`.\n", + "- In a standalone window with\n", + " ```julia\n", + " import Electron\n", + " open(vis, Electron.Application())\n", + " ```" + ] + }, { "cell_type": "code", "execution_count": null, "metadata": {}, "outputs": [], "source": [ - "## To open the visualizer in a new browser tab, do: \n", - "# open(vis)\n", - "\n", - "## To open the visualizer inside this jupyter notebook, do: \n", - "# render(vis)\n", - "\n", - "## To open this visualizer in a standalone window, do:\n", - "# import Electron\n", - "# open(vis, Electron.Application())\n", - "\n", "render(vis)" ] }, @@ -265,8 +269,7 @@ "metadata": {}, "outputs": [], "source": [ - "# MeshCat.convert_frames_to_video(\n", - "# \"/home/rdeits/Downloads/meshcat_1528401494656.tar\")" + "# MeshCat.convert_frames_to_video(expanduser(\"~/Downloads/meshcat_1528401494656.tar\"))" ] } ], @@ -276,15 +279,15 @@ "lastKernelId": null }, "kernelspec": { - "display_name": "Julia 1.10.2", + "display_name": "Julia 1.11.0", "language": "julia", - "name": "julia-1.10" + "name": "julia-1.11" }, "language_info": { "file_extension": ".jl", "mimetype": "application/julia", "name": "julia", - "version": "1.10.2" + "version": "1.11.0" } }, "nbformat": 4, diff --git a/notebooks/demo.ipynb b/notebooks/demo.ipynb index c5c7d4c..514ba36 100644 --- a/notebooks/demo.ipynb +++ b/notebooks/demo.ipynb @@ -530,15 +530,15 @@ "lastKernelId": null }, "kernelspec": { - "display_name": "Julia 1.10.2", + "display_name": "Julia 1.11.0", "language": "julia", - "name": "julia-1.10" + "name": "julia-1.11" }, "language_info": { "file_extension": ".jl", "mimetype": "application/julia", "name": "julia", - "version": "1.10.2" + "version": "1.11.0" } }, "nbformat": 4, diff --git a/test/notebook.jl b/test/notebook.jl index defbd97..991d68b 100644 --- a/test/notebook.jl +++ b/test/notebook.jl @@ -1,3 +1,3 @@ using NBInclude @nbinclude(joinpath(@__DIR__, "..", "notebooks", "demo.ipynb")) -@nbinclude(joinpath(@__DIR__, "..", "notebooks", "animation.ipynb")) +# @nbinclude(joinpath(@__DIR__, "..", "notebooks", "animation.ipynb")) From b2af1b8feb5fad30f0439a4ea311f5f34ebc8814 Mon Sep 17 00:00:00 2001 From: Henrique Ferrolho Date: Fri, 11 Oct 2024 15:22:56 +0100 Subject: [PATCH 2/6] Update version of Julia on CI jobs --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e15e563..d4b1f33 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: version: - - '1.6' + - '1.10' - '1' os: - ubuntu-latest @@ -26,7 +26,7 @@ jobs: prefix: xvfb-run exclude: - os: windows-latest - version: '1.6' + version: '1.10' steps: - uses: actions/checkout@v3 From a425affcb919fe5d5c45f2feadc93e80a694bfaa Mon Sep 17 00:00:00 2001 From: Henrique Ferrolho Date: Sat, 12 Oct 2024 09:38:16 +0100 Subject: [PATCH 3/6] Revert base Julia version requirement --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 87fece8..065e837 100644 --- a/Project.toml +++ b/Project.toml @@ -42,7 +42,7 @@ Requires = "1" Rotations = "1" StaticArrays = "1" Tar = "1" -julia = "1.10" +julia = "1.6" [extras] ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" From 645ab0831f9750e01c8d96d3fa649d1ace82adf2 Mon Sep 17 00:00:00 2001 From: Henrique Ferrolho Date: Sat, 12 Oct 2024 09:40:22 +0100 Subject: [PATCH 4/6] Bring back 0.x versions for Requires.jl and StaticArrays.jl --- Project.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index 065e837..e11e43e 100644 --- a/Project.toml +++ b/Project.toml @@ -38,9 +38,9 @@ MeshIO = "0.4" MsgPack = "1" Parameters = "0.10, 0.11, 0.12, 0.13" PrecompileTools = "1" -Requires = "1" +Requires = "0.5, 1" Rotations = "1" -StaticArrays = "1" +StaticArrays = "0.10, 0.11, 0.12, 1" Tar = "1" julia = "1.6" From 4a78eb4b00f8d5ddc45c07a7817f764657844749 Mon Sep 17 00:00:00 2001 From: Henrique Ferrolho Date: Sat, 12 Oct 2024 09:45:35 +0100 Subject: [PATCH 5/6] Add 1.6 back to CI and include ARM for macOS --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4b1f33..fc794bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,7 @@ jobs: fail-fast: false matrix: version: + - '1.6' - '1.10' - '1' os: @@ -22,11 +23,16 @@ jobs: arch: - x64 include: + - os: macOS-latest + arch: arm64 + version: 1 - os: ubuntu-latest prefix: xvfb-run exclude: - os: windows-latest - version: '1.10' + version: + - '1.6' + - '1.10' steps: - uses: actions/checkout@v3 From 28cf359cc40267b6289e92d2533ce7ec01100a06 Mon Sep 17 00:00:00 2001 From: Henrique Ferrolho Date: Tue, 22 Oct 2024 20:28:14 +0100 Subject: [PATCH 6/6] Re-enable animation.ipynb --- notebooks/animation.ipynb | 4 ++-- notebooks/demo.ipynb | 7 +++---- test/notebook.jl | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/notebooks/animation.ipynb b/notebooks/animation.ipynb index e574ef9..169cd78 100644 --- a/notebooks/animation.ipynb +++ b/notebooks/animation.ipynb @@ -279,7 +279,7 @@ "lastKernelId": null }, "kernelspec": { - "display_name": "Julia 1.11.0", + "display_name": "Julia 1.11.1", "language": "julia", "name": "julia-1.11" }, @@ -287,7 +287,7 @@ "file_extension": ".jl", "mimetype": "application/julia", "name": "julia", - "version": "1.11.0" + "version": "1.11.1" } }, "nbformat": 4, diff --git a/notebooks/demo.ipynb b/notebooks/demo.ipynb index 514ba36..c3558a9 100644 --- a/notebooks/demo.ipynb +++ b/notebooks/demo.ipynb @@ -517,8 +517,7 @@ "metadata": {}, "outputs": [], "source": [ - "path = joinpath(@__DIR__, \"..\", \"test\", \"data\", \"meshes\", \"cube.dae\")\n", - "\n", + "path = joinpath(@__DIR__, \"..\", \"test\", \"data\", \"meshes\", \"cube.obj\")\n", "setobject!(vis[\"meshes\", \"dae_file_object\"], MeshFileObject(path))\n", "settransform!(vis[\"meshes\", \"dae_file_object\"], Translation(0.0, 2.5, 0.0))" ] @@ -530,7 +529,7 @@ "lastKernelId": null }, "kernelspec": { - "display_name": "Julia 1.11.0", + "display_name": "Julia 1.11.1", "language": "julia", "name": "julia-1.11" }, @@ -538,7 +537,7 @@ "file_extension": ".jl", "mimetype": "application/julia", "name": "julia", - "version": "1.11.0" + "version": "1.11.1" } }, "nbformat": 4, diff --git a/test/notebook.jl b/test/notebook.jl index 991d68b..defbd97 100644 --- a/test/notebook.jl +++ b/test/notebook.jl @@ -1,3 +1,3 @@ using NBInclude @nbinclude(joinpath(@__DIR__, "..", "notebooks", "demo.ipynb")) -# @nbinclude(joinpath(@__DIR__, "..", "notebooks", "animation.ipynb")) +@nbinclude(joinpath(@__DIR__, "..", "notebooks", "animation.ipynb"))