Skip to content

Commit

Permalink
Add Project.toml, remove REQUIRE file
Browse files Browse the repository at this point in the history
Also:
* Update Travis and Appveyor config.
* Drop use of Compat.
  • Loading branch information
oschulz committed May 23, 2019
1 parent d4fba9c commit 0684634
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 43 deletions.
7 changes: 4 additions & 3 deletions appveyor.yml → .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
## Documentation: https://github.com/JuliaCI/Appveyor.jl

environment:
matrix:
- julia_version: 1.0
- julia_version: 1.1
- julia_version: latest
- julia_version: nightly

platform:
- x86 # 32-bit
Expand All @@ -12,8 +14,7 @@ platform:
## (tests will run but not make your overall status red)
#matrix:
# allow_failures:
# - julia_version: 1.0
# - julia_version: latest
# - julia_version: nightly

#branches:
# only:
Expand Down
2 changes: 1 addition & 1 deletion .codecov.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
comment: false
# comment: false
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.DS_Store
*.jl.cov
*.jl.*.cov
*.jl.mem
.ipynb_checkpoints
Manifest.toml
29 changes: 10 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,27 @@
## Documentation: http://docs.travis-ci.com/user/languages/julia/

language: julia

os:
- linux
- osx

julia:
- 1.0
- 1.1
- nightly
notifications:
email: false
git:
depth: 99999999

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

## uncomment and modify the following lines to manually install system packages
#addons:
# apt: # apt-get for linux
# packages:
# - gfortran
#before_script: # homebrew for mac
# - if [ $TRAVIS_OS_NAME = osx ]; then brew install gcc; fi
notifications:
email: false

## uncomment the following lines to override the default test script
#script:
# - julia -e 'VERSION >= v"0.7-" && import Pkg; if VERSION < v"0.7.0-DEV.5183" ; Pkg.clone(pwd()) ; else; Pkg.up(); end ; Pkg.test("ElasticArrays"; coverage=true)'
after_success:
# push coverage results to Coveralls
- julia -e 'VERSION >= v"0.7-" && import Pkg; cd(Pkg.dir("ElasticArrays")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
# push coverage results to Codecov
- julia -e 'VERSION >= v"0.7-" && import Pkg; cd(Pkg.dir("ElasticArrays")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
- julia -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
# push coverage results to Coveralls
- julia -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
14 changes: 14 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name = "ElasticArrays"
uuid = "fdbdab4c-e67f-52f5-8c3f-e7b388dad3d4"
version = "0.3.0"

[deps]

[compat]
julia = "1"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
2 changes: 0 additions & 2 deletions REQUIRE

This file was deleted.

4 changes: 0 additions & 4 deletions src/ElasticArrays.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@ __precompile__(true)

module ElasticArrays

using Compat
using Compat.Markdown

include("util.jl")
include("elasticarray.jl")


end # module
12 changes: 6 additions & 6 deletions src/elasticarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,14 @@ end
dest
end

@inline Compat.copyto!(dest::ElasticArray, doffs::Integer, src::AbstractArray, args::Integer...) = _copyto_impl!(dest, doffs, src, args...)
@inline Compat.copyto!(dest::ElasticArray, src::AbstractArray) = _copyto_impl!(dest, src)
@inline Base.copyto!(dest::ElasticArray, doffs::Integer, src::AbstractArray, args::Integer...) = _copyto_impl!(dest, doffs, src, args...)
@inline Base.copyto!(dest::ElasticArray, src::AbstractArray) = _copyto_impl!(dest, src)

@inline Compat.copyto!(dest::ElasticArray, doffs::Integer, src::ElasticArray, args::Integer...) = _copyto_impl!(dest, doffs, src, args...)
@inline Compat.copyto!(dest::ElasticArray, src::ElasticArray) = _copyto_impl!(dest, src)
@inline Base.copyto!(dest::ElasticArray, doffs::Integer, src::ElasticArray, args::Integer...) = _copyto_impl!(dest, doffs, src, args...)
@inline Base.copyto!(dest::ElasticArray, src::ElasticArray) = _copyto_impl!(dest, src)

@inline Compat.copyto!(dest::AbstractArray, doffs::Integer, src::ElasticArray, args::Integer...) = copyto!(dest, doffs, src.data, args...)
@inline Compat.copyto!(dest::AbstractArray, src::ElasticArray) = copyto!(dest, src.data)
@inline Base.copyto!(dest::AbstractArray, doffs::Integer, src::ElasticArray, args::Integer...) = copyto!(dest, doffs, src.data, args...)
@inline Base.copyto!(dest::AbstractArray, src::ElasticArray) = copyto!(dest, src.data)


Base.similar(::Type{ElasticArray{T}}, dims::Dims{N}) where {T,N} = ElasticArray{T}(undef, dims...)
Expand Down
6 changes: 1 addition & 5 deletions test/elasticarray.jl
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# This file is a part of ElasticArrays.jl, licensed under the MIT License (MIT).

using ElasticArrays
using Compat
using Compat.Test
using Compat.Random
using Compat: axes

using Test

@testset "elasticarray" begin
test_dims = (3, 2, 4)
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is a part of ElasticArrays.jl, licensed under the MIT License (MIT).

import Compat.Test
import Test
Test.@testset "Package ElasticArrays" begin
include("util.jl")
include("elasticarray.jl")
Expand Down
3 changes: 1 addition & 2 deletions test/util.jl
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# This file is a part of ElasticArrays.jl, licensed under the MIT License (MIT).

using ElasticArrays
using Compat.Test

using Test

@testset "util" begin
@testset "_split_dims" begin
Expand Down

0 comments on commit 0684634

Please sign in to comment.