Merge pull request #162 from JuliaArrays/cjf/use-project-toml

Upgrade REQUIRE -> Project.toml

Author: c42f

.travis.yml

@@ -5,30 +5,32 @@ os:
 julia:
   - 0.7
   - 1.0
+  - 1.1
+  - 1.2
   - nightly
 notifications:
   email: false
 matrix:
   allow_failures:
     - julia: nightly
 
-# uncomment the following lines to override the default test script
-script:
-  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - julia --check-bounds=yes --color=yes -e 'import Pkg; Pkg.clone(pwd()); Pkg.build("AxisArrays"); Pkg.test("AxisArrays"; coverage=true)';
+# script:
+#   # Default Travis script uses the more or less the following with Project.toml
+#   - julia -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'
 
 jobs:
   include:
-    - stage: deploy
-      julia: 1.0
+    - stage: "Documentation"
+      julia: 1.1
       os: linux
       script:
-        - julia -e 'import Pkg; Pkg.clone(pwd()); Pkg.build("AxisArrays")'
-        - julia -e 'import Pkg; ps=Pkg.PackageSpec(name="Documenter", version="0.19"); Pkg.add(ps); Pkg.pin(ps); Pkg.add("Unitful")'
-        - julia -e 'import AxisArrays; ENV["DOCUMENTER_DEBUG"] = "true"; include(joinpath("docs","make.jl"))'
+        - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd()));
+                                               Pkg.instantiate()'
+        - julia --project=docs/ docs/make.jl
+      after_success: skip
 
 after_success:
 #  - julia -e 'Pkg.add("Unitful")' ?
-  - if [ $TRAVIS_JULIA_VERSION = "1.0" ] && [ $TRAVIS_OS_NAME = "linux" ]; then
+  - if [ $TRAVIS_JULIA_VERSION = "1.1" ] && [ $TRAVIS_OS_NAME = "linux" ]; then
       julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder())';
     fi

Project.toml

@@ -0,0 +1,24 @@
+name = "AxisArrays"
+uuid = "39de3d68-74b9-583c-8d2d-e117c070f3a9"
+version = "0.3.0"
+
+[deps]
+Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
+IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
+IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
+RangeArrays = "b3c3ace0-ae52-54e7-9d0b-2c1406fd6b9d"
+
+[compat]
+IntervalSets = "≥ 0.1.0"
+Unitful = "≥ 0.2.6"
+julia = "≥ 0.7.0"
+
+[extras]
+Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
+OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
+
+[targets]
+test = ["OffsetArrays", "Unitful", "Dates", "Test", "Random"]

REQUIRE

@@ -0,0 +1,8 @@
+[deps]
+AxisArrays = "39de3d68-74b9-583c-8d2d-e117c070f3a9"
+Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
+
+[compat]
+Documenter = "~0.22"
+Unitful = "≥ 0.2.6"

docs/Project.toml

@@ -7,6 +7,5 @@ makedocs(
 
 deploydocs(
     deps   = Deps.pip("mkdocs", "python-markdown-math"),
-    repo   = "github.com/JuliaArrays/AxisArrays.jl.git",
-    julia  = "1.0"
+    repo   = "github.com/JuliaArrays/AxisArrays.jl.git"
 )

docs/make.jl

@@ -6,7 +6,6 @@ using Base: tail
 import Base.Iterators: repeated
 using RangeArrays, IntervalSets
 using IterTools
-using Compat
 using Dates
 
 function axes end

src/AxisArrays.jl

@@ -280,7 +280,7 @@ end
 function axisdim(::Type{AxisArray{T,N,D,Ax}}, ::Type{<:Axis{name,S} where S}) where {T,N,D,Ax,name}
     isa(name, Int) && return name <= N ? name : error("axis $name greater than array dimensionality $N")
     names = axisnames(Ax)
-    idx = Compat.findfirst(isequal(name), names)
+    idx = findfirst(isequal(name), names)
     idx === nothing && error("axis $name not found in array axes $names")
     idx
 end

src/core.jl

@@ -286,13 +286,13 @@ end
 
 # Categorical axes may be indexed by their elements
 function axisindexes(::Type{Categorical}, ax::AbstractVector, idx)
-    i = Compat.findfirst(isequal(idx), ax)
+    i = findfirst(isequal(idx), ax)
     i === nothing && throw(ArgumentError("index $idx not found"))
     i
 end
 function axisindexes(::Type{Categorical}, ax::AbstractVector, idx::Value)
     val = idx.val
-    i = Compat.findfirst(isequal(val), ax)
+    i = findfirst(isequal(val), ax)
     i === nothing && throw(ArgumentError("index $val not found"))
     i
 end