Merge pull request #5 from tkoolen/tk/0.7

Fixes for 0.7

Author: tkoolen

.travis.yml

@@ -5,21 +5,18 @@ os:
   - linux
 julia:
   - 0.6
+  - 1.0
   - nightly
 dist: trusty
 branches:
-  only: master
+  only:
+    - master
+    - /^v[0-9]+\.[0-9]+\.[0-9]+$/ # version tags
 matrix:
   allow_failures:
     - julia: nightly
 notifications:
   email: false
-
-## uncomment the following lines to override the default test script
-#script:
-#  - julia -e 'Pkg.clone(pwd()); Pkg.build("DrakeLCMTypes"); Pkg.test("DrakeLCMTypes"; coverage=true)'
 after_success:
-  # push coverage results to Coveralls
-  - julia -e 'cd(Pkg.dir("BotCoreLCMTypes")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
   # push coverage results to Codecov
-  - julia -e 'cd(Pkg.dir("BotCoreLCMTypes")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
+  - julia -e 'if VERSION >= v"0.7-"; using Pkg; else; cd(Pkg.dir("BotCoreLCMTypes")); end; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'

src/sensor_status_t.jl

@@ -1,7 +1,7 @@
 # The sensor_status_t has a field named `type`, which is a reserved
 # keyword in Julia v0.7 and below. To get around that, we can just
 # construct the expression directly instead of relying on the parser.
-eval(Expr(:type, true,
+eval(Expr(VERSION < v"0.7-" ? :type : :struct, true,
     Expr(:(<:), :sensor_status_t, :LCMType),
     Expr(:block,
         Expr(:(::), :utime, :Int64),

src/viewer_geometry_data_t.jl

@@ -1,7 +1,7 @@
 # The viewer_geometry_data_t has a field named `type`, which is a reserved
 # keyword in Julia v0.7 and below. To get around that, we can just
 # construct the expression directly instead of relying on the parser
-eval(Expr(:type, true,
+eval(Expr(VERSION < v"0.7-" ? :type : :struct, true,
     Expr(:(<:), :viewer_geometry_data_t, :LCMType),
     Expr(:block,
         Expr(:(::), :type, :Int8),

test/runtests.jl

@@ -1,7 +1,12 @@
 using BotCoreLCMTypes
 using LCMCore
 using LCMCore: fingerprint
-using Base.Test
+
+if VERSION >= v"0.7-"
+    using Test
+else
+    using Base.Test
+end
 
 #=
 The following Python code was used to retrieve all of the
@@ -30,14 +35,14 @@ for name, obj in inspect.getmembers(drake):
 
 """
 Equality test for most types, but we compare LCMType instances
-by looking at their fields, since otherwise == just falls back 
-to === which compares object identity and is thus not very 
+by looking at their fields, since otherwise == just falls back
+to === which compares object identity and is thus not very
 informative.
 """
 closeenough(x, y) = x == y
 function closeenough(x::LCMType, y::LCMType)
     (typeof(x) == typeof(y)) || return false
-    for name in fieldnames(x)
+    for name in fieldnames(typeof(x))
         closeenough(getfield(x, name), getfield(y, name)) || return false
     end
     true