Skip to content

Commit

Permalink
Update dependencies and require Julia >= 1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
rdeits committed May 21, 2023
1 parent 6a24694 commit ba213df
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 48 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,11 @@ on:

jobs:
CompatHelper:
runs-on: ${{ matrix.os }}
strategy:
matrix:
julia-version: [1.2.0]
julia-arch: [x86]
os: [ubuntu-latest]
runs-on: ubuntu-latest
steps:
- uses: julia-actions/setup-julia@latest
with:
version: ${{ matrix.julia-version }}
version: 1.3
- name: Pkg.add("CompatHelper")
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
- name: CompatHelper.main()
Expand Down
17 changes: 16 additions & 1 deletion .github/workflows/TagBot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@ on:
types:
- created
workflow_dispatch:
inputs:
lookback:
default: 3
permissions:
actions: read
checks: read
contents: write
deployments: read
issues: read
discussions: read
packages: read
pages: read
pull-requests: read
repository-projects: read
security-events: read
statuses: read
jobs:
TagBot:
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
Expand All @@ -12,4 +28,3 @@ jobs:
- uses: JuliaRegistries/TagBot@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
ssh: ${{ secrets.DOCUMENTER_KEY }}
18 changes: 5 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.3'
- '1.6'
- '1'
os:
- ubuntu-latest
Expand All @@ -21,24 +21,16 @@ jobs:
arch:
- x64
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: actions/cache@v1
env:
cache-name: cache-artifacts
CI: true
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/cache@v1
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
with:
prefix: ${{ matrix.prefix }}
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v1
with:
Expand Down
13 changes: 7 additions & 6 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "MeshCatMechanisms"
uuid = "6ad125db-dd91-5488-b820-c1df6aab299d"
version = "0.8.2"
version = "0.8.3"

[deps]
ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
Expand All @@ -17,25 +17,26 @@ RigidBodyDynamics = "366cf18f-59d5-5db9-a4de-86a9f6786172"
[compat]
ColorTypes = "0.7, 0.8, 0.9, 0.10, 0.11"
CoordinateTransformations = "0.5, 0.6"
GeometryBasics = "0.2, 0.3, 0.4"
GeometryBasics = "0.4"
InteractBase = "0.8, 0.9, 0.10"
Interpolations = "0.9, 0.10, 0.11, 0.12, 0.13, 0.14"
Interpolations = "0.9, 0.10, 0.11, 0.12, 0.13"
LoopThrottle = "0.1"
MechanismGeometries = "0.7"
MeshCat = "0.13, 0.14, 0.15"
MeshCat = "0.13, 0.14, 0.15, 0.16"
NBInclude = "1, 2"
OrderedCollections = "1"
RigidBodyDynamics = "2"
ValkyrieRobot = "0.2.1"
julia = "1.3"
julia = "1.6"

[extras]
NBInclude = "0db19996-df87-5ea3-a455-e3a50d440464"
Electron = "a1bb12fb-d4d1-54b4-b10a-ee7951ef7ad3"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
ValkyrieRobot = "c74b26e8-f247-5d24-b013-c11a2bbd97c6"

[targets]
test = ["StaticArrays", "Pkg", "NBInclude", "Test", "ValkyrieRobot", "Random"]
test = ["StaticArrays", "Pkg", "NBInclude", "Test", "ValkyrieRobot", "Random", "Electron"]
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,8 @@ mechanism = rand_chain_mechanism(Float64,
mvis = MechanismVisualizer(mechanism, Skeleton(randomize_colors=true))

# Open the visualizer in a new window
#
# We don't open windows when we're running this test
# on the Travis CI build servers
if !haskey(ENV, "CI")
open(mvis, Electron.Application())
end
open(mvis, Electron.Application())

# Create sliders to manipulate the visualizer's configuration
widget = manipulate!(mvis)

# Render those sliders in a new window
#
# We don't open windows when we're running this test
# on the Travis CI build servers
if !haskey(ENV, "CI")
body!(Electron.Application(), widget)
end
body!(Electron.Application(), widget)
14 changes: 7 additions & 7 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,15 @@ vis = Visualizer()
for file in readdir(dir)
base, ext = splitext(file)
if ext == ".jl"
if file == "manipulation_with_electron.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
# if file == "manipulation_with_electron.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
# end
elseif ext == ".ipynb"
@info "Running notebook $file"
@nbinclude(joinpath(dir, file))
Expand Down

0 comments on commit ba213df

Please sign in to comment.