Small fixes for 1.0 (#52)

* small fixes for 1.0

* appveyor needs platform

* some tests assumed that Int==Int64

Author: simonschoelly

appveyor.yml

@@ -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"
+#  - julia_version: 0.7
+  - julia_version: 1
+  - julia_version: nightly
 
-## uncomment the following lines to allow failures on nightly julia
-## (tests will run but not make your overall status red)
+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_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"
+#   allow_failures:
+#   - julia_version: nightly
 
 branches:
   only:
@@ -23,25 +25,21 @@ notifications:
     on_build_failure: false
     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(), \"MetaGraphs\"); Pkg.build(\"MetaGraphs\")"
+  - C:\julia\bin\julia -e "using InteractiveUtils, Pkg; versioninfo();
+        Pkg.clone(pwd(), \"MetaGraphs\"); Pkg.build(\"MetaGraphs\")"
 
 test_script:
-  - C:\projects\julia\bin\julia -e "Pkg.test(\"MetaGraphs\")"
+    - C:\julia\bin\julia -e "using Pkg; Pkg.test(\"MetaGraphs\")"
+
+# # 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%"

src/MetaGraphs.jl

@@ -5,8 +5,7 @@ using JLD2
 import Base:
     eltype, show, ==, Pair,
     Tuple, copy, length, size,
-    start, next, done, issubset,
-    zero, getindex
+    issubset, zero, getindex
 import Random:
     randstring, seed!
 

test/metagraphs.jl

@@ -165,7 +165,7 @@ import Base64:
     mg = MetaGraph(CompleteGraph(3), 3.0)
     @test enumerate_paths(dijkstra_shortest_paths(mg, 1), 3) == [1, 3]
     @test typeof(set_prop!(mg, 1, 2, :weight, 0.2)) == Dict{Symbol,Float64}
-    @test typeof(set_prop!(mg, 2, 3, :weight, 1)) == Dict{Symbol,Int64}
+    @test typeof(set_prop!(mg, 2, 3, :weight, 1)) == Dict{Symbol,Int}
     @test enumerate_paths(dijkstra_shortest_paths(mg, 1), 3) == [1, 2, 3]
 
     @test typeof(set_prop!(mg, 1, :color, "blue")) == Dict{Symbol,String}
@@ -226,7 +226,7 @@ import Base64:
     add_edge!(mg, 1, 3)
     @test enumerate_paths(dijkstra_shortest_paths(mg, 1), 3) == [1, 3]
     @test typeof(set_prop!(mg, 1, 2, :weight, 0.2)) == Dict{Symbol,Float64}
-    @test typeof(set_prop!(mg, 2, 3, :weight, 1)) == Dict{Symbol,Int64}
+    @test typeof(set_prop!(mg, 2, 3, :weight, 1)) == Dict{Symbol,Int}
     @test enumerate_paths(dijkstra_shortest_paths(mg, 1), 3) == [1, 2, 3]
 
     @test typeof(set_prop!(mg, 1, :color, "blue")) == Dict{Symbol,String}