Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update compat dependencies and add Julia LTS (1.10) to the CI #255

Merged
merged 6 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
matrix:
version:
- '1.6'
- '1.10'
- '1'
os:
- ubuntu-latest
Expand All @@ -22,11 +23,16 @@ jobs:
arch:
- x64
include:
- os: macOS-latest
arch: arm64
version: 1
Comment on lines +26 to +28
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have added a new runner for macOS on ARM.

- os: ubuntu-latest
prefix: xvfb-run
exclude:
- os: windows-latest
version: '1.6'
version:
- '1.6'
- '1.10'

steps:
- uses: actions/checkout@v3
Expand Down
10 changes: 5 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "MeshCat"
uuid = "283c5d60-a78f-5afe-a0af-af636b173e11"
authors = ["Robin Deits <[email protected]>"]
version = "0.16.2"
version = "0.16.3"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor version bump for MeshCat.jl


[deps]
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
Expand Down Expand Up @@ -33,13 +33,13 @@ 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"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to have

Suggested change
Meshing = "0.5, 0.6"
Meshing = "0.5, 0.6, 0.7"

but Meshing.jl v0.7 breaks the snippets for creating a Mesh using marching cubes.

See my comment here: JuliaGeometry/Meshing.jl#99 (comment)

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"
Rotations = "1"
StaticArrays = "0.10, 0.11, 0.12, 1"
Tar = "1"
julia = "1.6"
Expand All @@ -48,8 +48,8 @@ julia = "1.6"
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"
Expand Down
4 changes: 2 additions & 2 deletions notebooks/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions notebooks/Static HTML Visualizers.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
33 changes: 18 additions & 15 deletions notebooks/animation.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
]
},
Expand Down Expand Up @@ -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\"))"
]
}
],
Expand All @@ -276,15 +279,15 @@
"lastKernelId": null
},
"kernelspec": {
"display_name": "Julia 1.10.2",
"display_name": "Julia 1.11.1",
"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.1"
}
},
"nbformat": 4,
Expand Down
9 changes: 4 additions & 5 deletions notebooks/demo.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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))"
]
Expand All @@ -530,15 +529,15 @@
"lastKernelId": null
},
"kernelspec": {
"display_name": "Julia 1.10.2",
"display_name": "Julia 1.11.1",
"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.1"
}
},
"nbformat": 4,
Expand Down
Loading