Skip to content

Commit

Permalink
Merge pull request #46 from JuliaRobotics/rd/update-compat
Browse files Browse the repository at this point in the history
mark support for MeshCat 0.11 and MechanismGeometries 0.5
  • Loading branch information
rdeits authored May 24, 2020
2 parents c642b5f + d1f35c3 commit 6d09a62
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ GeometryTypes = "0.6, 0.7, 0.8"
InteractBase = "0.8, 0.9, 0.10"
Interpolations = "0.9, 0.10, 0.11, 0.12"
LoopThrottle = "0.1"
MechanismGeometries = "0.4"
MeshCat = "0.10"
MechanismGeometries = "0.4, 0.5"
MeshCat = "0.10, 0.11"
Mux = "0.7.1"
NBInclude = "1, 2"
OrderedCollections = "1.0, 1.1"
Expand Down
13 changes: 10 additions & 3 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,17 @@ vis = Visualizer()
for file in readdir(dir)
base, ext = splitext(file)
if ext == ".jl"
println("Running $file")
include(joinpath(dir, file))
if file == "manipulation_with_blink.jl"
# The interaction between MeshCat and Interact
# causes weird task deadlocks that I don't want
# to deal with right now.
@warn "Skipping $file"
else
@info "Running $file"
include(joinpath(dir, file))
end
elseif ext == ".ipynb"
println("Running notebook $file")
@info "Running notebook $file"
@nbinclude(joinpath(dir, file))
end
end
Expand Down

2 comments on commit 6d09a62

@rdeits
Copy link
Collaborator Author

@rdeits rdeits commented on 6d09a62 May 24, 2020

Choose a reason for hiding this comment

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

@JuliaRegistrator register()

  • Compatibility with the latest MeshCat and MechanismGeometries releases

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

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

Error while trying to register: "Tag with name v0.7.0 already exists and points to a different commit"

Please sign in to comment.