Skip to content

Commit

Permalink
Merge pull request #28 from JuliaRobotics/project-toml
Browse files Browse the repository at this point in the history
Add Project.toml
  • Loading branch information
tkoolen authored May 13, 2019
2 parents 56c8ca4 + f10d666 commit f57cadc
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 53 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
*.jl.*.cov
*.jl.mem
.ipynb_checkpoints
/Manifest.toml

6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ language: julia
os:
- linux
julia:
- 0.7
- 1.0
- 1.1
- nightly
notifications:
email: false
Expand All @@ -15,7 +15,5 @@ branches:
only:
- master
- /^v[0-9]+\.[0-9]+\.[0-9]+$/ # version tags
# before_script:
# - julia -e 'Pkg.init(); Pkg.add("MeshCat"); Pkg.checkout("MeshCat")'
after_success:
- julia test/coverage.jl
- julia --project -e 'using Pkg; pkg"add Coverage"; using Coverage; Codecov.submit(Codecov.process_folder())'
41 changes: 41 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name = "MeshCatMechanisms"
uuid = "6ad125db-dd91-5488-b820-c1df6aab299d"
version = "0.4.0"

[deps]
ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
CoordinateTransformations = "150eb455-5306-5404-9cee-2592286d6298"
GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
InteractBase = "d3863d7c-f0c8-5437-a7b4-3ae773c01009"
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
LoopThrottle = "39f5be34-8529-5463-bac7-bf6867c840a3"
MechanismGeometries = "931e9471-e8fb-5385-a477-07ad12718aca"
MeshCat = "283c5d60-a78f-5afe-a0af-af636b173e11"
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
RigidBodyDynamics = "366cf18f-59d5-5db9-a4de-86a9f6786172"

[compat]
ColorTypes = "≥ 0.2.0"
CoordinateTransformations = "≥ 0.4.1"
GeometryTypes = "≥ 0.4.0"
InteractBase = "≥ 0.8.0"
Interpolations = "≥ 0.9.0"
LoopThrottle = "≥ 0.0.1"
MechanismGeometries = "≥ 0.2.0"
MeshCat = "≥ 0.6.0"
NBInclude = "≥ 1.1.0"
OrderedCollections = "≥ 1.0.0"
RigidBodyDynamics = "≥ 0.4.0"
ValkyrieRobot = "≥ 0.0.1"
julia = "≥ 0.7.0"

[extras]
Blink = "ad839575-38b3-5650-b840-f874b8c74a25"
NBInclude = "0db19996-df87-5ea3-a455-e3a50d440464"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
ValkyrieRobot = "c74b26e8-f247-5d24-b013-c11a2bbd97c6"

[targets]
test = ["StaticArrays", "Pkg", "NBInclude", "Test", "Blink", "ValkyrieRobot"]
11 changes: 0 additions & 11 deletions REQUIRE

This file was deleted.

52 changes: 24 additions & 28 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
environment:
matrix:
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"

## uncomment the following lines to allow failures on nightly julia
## (tests will run but not make your overall status red)
#matrix:
# allow_failures:
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
- julia_version: 1.0
- julia_version: 1
- julia_version: nightly

platform:
- x86 # 32-bit
- x64 # 64-bit

# # Uncomment the following lines to allow failures on nightly julia
# # (tests will run but not make your overall status red)
matrix:
allow_failures:
- julia_version: nightly

branches:
only:
Expand All @@ -24,24 +26,18 @@ notifications:
on_build_status_changed: false

install:
- ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
# If there's a newer build queued for the same PR, cancel this one
- ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
throw "There are newer queued builds for this pull request, failing early." }
# Download most recent Julia Windows binary
- ps: (new-object net.webclient).DownloadFile(
$env:JULIA_URL,
"C:\projects\julia-binary.exe")
# Run installer silently, output to C:\projects\julia
- C:\projects\julia-binary.exe /S /D=C:\projects\julia
- ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))

build_script:
# Need to convert from shallow to complete for Pkg.clone to work
- IF EXIST .git\shallow (git fetch --unshallow)
- C:\projects\julia\bin\julia -e "versioninfo();
Pkg.clone(pwd(), \"MeshCatMechanisms\"); Pkg.build(\"MeshCatMechanisms\")"
- echo "%JL_BUILD_SCRIPT%"
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"

test_script:
- C:\projects\julia\bin\julia -e "Pkg.test(\"MeshCatMechanisms\")"
- echo "%JL_TEST_SCRIPT%"
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"

# # Uncomment to support code coverage upload. Should only be enabled for packages
# # which would have coverage gaps without running on Windows
# on_success:
# - echo "%JL_CODECOV_SCRIPT%"
# - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"
4 changes: 0 additions & 4 deletions test/REQUIRE

This file was deleted.

6 changes: 0 additions & 6 deletions test/coverage.jl

This file was deleted.

0 comments on commit f57cadc

Please sign in to comment.