Skip to content

Commit 115a334

Browse files
authored
Merge pull request #10 from OpenMendel/Julia-0.7
upgrade to Julia 0.7+
2 parents d3ff019 + 4a3bdd2 commit 115a334

21 files changed

Lines changed: 2285 additions & 2577 deletions

.travis.yml

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,34 @@ os:
44
- linux
55
- osx
66
julia:
7-
- 0.6
7+
- 0.7
8+
- 1.0
89
- nightly
910
matrix:
1011
allow_failures:
1112
- julia: nightly
1213
addons:
1314
apt_packages:
1415
- gfortran
15-
# uncomment the following lines to override the default test script
16-
script:
17-
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
18-
- julia --check-bounds=yes --depwarn=no -e 'Pkg.clone(pwd()); Pkg.build("VarianceComponentModels"); Pkg.test("VarianceComponentModels"; coverage=true)'
19-
after_success:
20-
- julia -e 'Pkg.add("Coverage"); cd(Pkg.dir("VarianceComponentModels")); using Coverage; Coveralls.submit(Coveralls.process_folder()); Codecov.submit(process_folder())'
21-
- julia -e 'Pkg.add("Documenter"); cd(Pkg.dir("VarianceComponentModels")); include(joinpath("docs", "make.jl"))'
2216
notifications:
23-
email:
24-
on_success: change
25-
on_failure: always
26-
recipients:
27-
- huazhou@ucla.edu
17+
email: false
18+
git:
19+
depth: 99999999
20+
21+
# before_script: # install dependent unregistered packages
22+
# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
23+
# - julia -e 'using Pkg; Pkg.add([PackageSpec(url="https://github.com/OpenMendel/VarianceComponentModels.jl.git", rev="juliav0.7"), PackageSpec(url="https://github.com/OpenMendel/VarianceComponentModels.jl.git", rev="master")]);'
24+
after_script: # TODO: change to after_success once https://github.com/JuliaLang/julia/issues/28306 is fixed
25+
# push coverage results to Codecov and Coveralls
26+
- julia -e 'using Pkg, VarianceComponentModels; cd(joinpath(dirname(pathof(VarianceComponentModels)), "..")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder()); Coveralls.submit(process_folder())'
27+
28+
jobs:
29+
include:
30+
- stage: "Documentation"
31+
julia: 1.0
32+
os: osx
33+
script:
34+
- julia -e 'using Pkg; Pkg.add("Documenter")'
35+
- julia -e 'using VarianceComponentModels; include(joinpath(dirname(pathof(VarianceComponentModels)), "..", "docs", "make.jl"))'
36+
after_script: skip
37+
after_success: skip

Project.toml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name = "VarianceComponentModels"
2+
uuid = "813005db-34b4-5f71-be9e-1bbf0a1d8f1c"
3+
keywords = ["variance components model", "GWAS"]
4+
author = ["Hua Zhou <huazhou@ucla.edu>", "OpenMendel Team"]
5+
version = "0.1.0"
6+
7+
[deps]
8+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
9+
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
10+
MathProgBase = "fdba3010-5040-5b88-9595-932c9decdf73"
11+
Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
12+
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
13+
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
14+
15+
[extras]
16+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
17+
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
18+
19+
[targets]
20+
test = ["Test", "Random"]

README.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,20 @@ This [Julia](http://julialang.org/) package provides computational routines for
88

99
## Installation
1010

11-
Within Julia, use the package manager to install VarianceComponentModels:
11+
This package requires Julia v0.7.0 or later, which can be obtained from
12+
https://julialang.org/downloads/ or by building Julia from the sources in the
13+
https://github.com/JuliaLang/julia repository.
1214

13-
Pkg.clone("https://github.com/OpenMendel/VarianceComponentModels.jl.git")
14-
15-
This package supports Julia v0.5 and v0.6.
15+
The package has not yet been registered and must be installed using the repository location.
16+
Start julia and use the `]` key to switch to the package manager REPL
17+
```julia
18+
(v0.7) pkg> add https://github.com/OpenMendel/VarianceComponentModels.jl.git#Julia-0.7
19+
```
20+
Use the backspace key to return to the Julia REPL.
1621

1722
## Citation
1823

19-
If you use this analysis package in your research, please cite the following reference in the resulting publications:
24+
If you use [OpenMendel](https://openmendel.github.io) analysis packages in your research, please cite the following reference in the resulting publications:
2025

2126
*Lange K, Papp JC, Sinsheimer JS, Sripracha R, Zhou H, Sobel EM (2013) Mendel: The Swiss army knife of genetic analysis programs. Bioinformatics 29:1568-1570.*
2227

REQUIRE

Lines changed: 0 additions & 5 deletions
This file was deleted.

appveyor.yml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,37 @@
11
environment:
22
matrix:
3-
- JULIAVERSION: "julialang/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
4-
- JULIAVERSION: "julialang/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
5-
- JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
6-
- JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
3+
- julia_version: 0.7
4+
- julia_version: 1
5+
- julia_version: nightly
6+
7+
platform:
8+
- x86 # 32-bit
9+
- x64 # 64-bit
710

811
branches:
912
only:
1013
- master
1114
- /release-.*/
1215

13-
matrix:
14-
allow_failures:
15-
- JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
16-
- JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
17-
1816
notifications:
1917
- provider: Email
2018
on_build_success: false
2119
on_build_failure: false
2220
on_build_status_changed: false
2321

2422
install:
25-
# Download most recent Julia Windows binary
26-
- ps: (new-object net.webclient).DownloadFile(
27-
$("http://s3.amazonaws.com/"+$env:JULIAVERSION),
28-
"C:\projects\julia-binary.exe")
29-
# Run installer silently, output to C:\projects\julia
30-
- C:\projects\julia-binary.exe /S /D=C:\projects\julia
23+
- ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
3124

3225
build_script:
33-
# Need to convert from shallow to complete for Pkg.clone to work
34-
- IF EXIST .git\shallow (git fetch --unshallow)
35-
- C:\projects\julia\bin\julia -e "versioninfo();
36-
Pkg.clone(pwd(), \"VarianceComponentModels\"); Pkg.build(\"VarianceComponentModels\")"
26+
- echo "%JL_BUILD_SCRIPT%"
27+
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
3728

3829
test_script:
39-
- C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"VarianceComponentModels\")"
30+
- echo "%JL_TEST_SCRIPT%"
31+
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
32+
33+
# # Uncomment to support code coverage upload. Should only be enabled for packages
34+
# # which would have coverage gaps without running on Windows
35+
# on_success:
36+
# - echo "%JL_CODECOV_SCRIPT%"
37+
# - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"

0 commit comments

Comments
 (0)