Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make package Julia 1.x compatible #19

Merged
merged 4 commits into from
Oct 11, 2019
Merged

Make package Julia 1.x compatible #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ff69b5
Add Project.toml and remove REQUIRE
ahojukka5 Oct 10, 2019
8a67dc3
Do not generate documentation in test/runtests.jl
ahojukka5 Oct 10, 2019
0472e5e
Add Julia 1.2 and 1.3 to Travis CI
ahojukka5 Oct 10, 2019
61f4d81
Remove some unnecessary dependencies
ahojukka5 Oct 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@ language: julia
os:
- linux
- osx
- windows

julia:
- 0.7
- 1.0
- nightly
- 1.2
- 1.3

matrix:
fast_finish: true
allow_failures:
- julia: nightly
- julia: 1.3
os: windows

addons:
apt:
Expand All @@ -20,5 +23,16 @@ addons:
homebrew:
packages:
- hdf5

jobs:
include:
- stage: "Documentation"
os: linux
script:
- julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
- julia --project=docs/ docs/make.jl
after_success:
- julia --project=docs/ docs/deploy.jl

after_success:
- julia -e 'cd(Pkg.dir("AsterReader")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
16 changes: 16 additions & 0 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name = "AsterReader"
uuid = "cb1a753d-6b7b-52e3-9bfe-57d99d445c39"
authors = ["Jukka Aho <ahojukka5@gmail.com>"]
version = "0.2.3"

[deps]
HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"

[compat]
julia = "≥ 1.0"

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

[targets]
test = ["Test"]
3 changes: 0 additions & 3 deletions REQUIRE
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions docs/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[deps]
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
2 changes: 1 addition & 1 deletion src/AsterReader.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

module AsterReader

using FEMBase, HDF5, LinearAlgebra, SparseArrays
using HDF5

"""
parse_node_id(node_name)
Expand Down
1 change: 0 additions & 1 deletion test/REQUIRE
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
# This file is a part of JuliaFEM.
# License is MIT: see https://github.com/JuliaFEM/AsterReader.jl/blob/master/LICENSE

using FEMBase, AsterReader, Test, LinearAlgebra, SparseArrays

include(joinpath("..", "docs", "make.jl"))
using Test, AsterReader

@testset "AsterReader.jl" begin
include("test_read_aster_mesh.jl")
include("test_read_aster_results.jl")
include("test_read_gmsh_med.jl")
end

include(joinpath("..", "docs", "deploy.jl"))
2 changes: 1 addition & 1 deletion test/test_read_aster_mesh.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is a part of JuliaFEM.
# License is MIT: see https://github.com/JuliaFEM/AsterReader.jl/blob/master/LICENSE

using FEMBase, Test, AsterReader
using Test, AsterReader
using AsterReader: aster_parse_nodes, aster_read_mesh, MEDFile, get_element_sets

datadir = first(splitext(basename(@__FILE__)))
Expand Down
2 changes: 1 addition & 1 deletion test/test_read_aster_results.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is a part of JuliaFEM.
# License is MIT: see https://github.com/JuliaFEM/AsterReader.jl/blob/master/LICENSE

using FEMBase, AsterReader, Test
using AsterReader, Test
using AsterReader: RMEDFile, aster_read_data

datadir = first(splitext(basename(@__FILE__)))
Expand Down
2 changes: 1 addition & 1 deletion test/test_read_gmsh_med.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is a part of JuliaFEM.
# License is MIT: see https://github.com/JuliaFEM/AsterReader.jl/blob/master/LICENSE

using FEMBase, Test, AsterReader
using Test, AsterReader
using AsterReader: aster_parse_nodes, aster_read_mesh, MEDFile, get_element_sets

datadir = first(splitext(basename(@__FILE__)))
Expand Down