Merge pull request #8 from JuliaArrays/teh/project

REQUIRE->Project.toml

.travis.yml

@@ -6,6 +6,7 @@ os:
 julia:
   - 0.7
   - 1.0
+  - 1
   - nightly
 notifications:
   email: false

Project.toml

@@ -0,0 +1,19 @@
+name = "CatIndices"
+uuid = "aafaddc9-749c-510e-ac4f-586e18779b91"
+author = ["Tim Holy <tim.holy@gmail.com>"]
+version = "0.2.1"
+
+[deps]
+CustomUnitRanges = "dc8bdbbb-1ca9-579f-8c36-e416f6a65cce"
+OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
+
+[compat]
+CustomUnitRanges = "0.2, 1"
+OffsetArrays = "0.8.1, 0.9, 0.10, 0.11, 1"
+julia = "0.7, 1"
+
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test"]

README.md

@@ -1,8 +1,8 @@
 # CatIndices
 
 [![Build Status](https://travis-ci.org/JuliaArrays/CatIndices.jl.svg?branch=master)](https://travis-ci.org/JuliaArrays/CatIndices.jl)
-
 [![codecov.io](http://codecov.io/github/JuliaArrays/CatIndices.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaArrays/CatIndices.jl?branch=master)
+[![PkgEval][pkgeval-img]][pkgeval-url]
 
 A Julia package for concatenating, growing, and shrinking arrays in
 ways that allow control over the resulting axes.
@@ -63,4 +63,28 @@ many items at the beginning or end of the vector, this package exports
 
 # Concatenation
 
-TODO
+This is still mostly a TODO. For one-dimensional arrays (`AbstractVector`s),
+`PinIndices` provides a convenient interface for specifying which indices "win":
+
+```julia
+julia> v = vcat(1:3, PinIndices(4:5), 6:10)
+10-element OffsetArray(::Array{Int64,1}, -2:7) with eltype Int64 with indices -2:7:
+  1
+  2
+  3
+  4
+  5
+  6
+  7
+  8
+  9
+ 10
+
+julia> v[1]
+4
+```
+
+The array wrapped in `PinIndices` keeps its own indexes, and everything else adjusts to compensate.
+
+[pkgeval-img]: https://juliaci.github.io/NanosoldierReports/pkgeval_badges/C/CatIndices.svg
+[pkgeval-url]: https://juliaci.github.io/NanosoldierReports/pkgeval_badges/report.html

appveyor.yml

@@ -1,6 +1,7 @@
 environment:
   matrix:
   - julia_version: 0.7
+  - julia_version: 1.0
   - julia_version: 1
   - julia_version: nightly