Skip to content

Commit 01099a1

Browse files
committed
Merge branch 'release/v0.15.0'
2 parents ad692a8 + b82e56d commit 01099a1

32 files changed

+304
-93
lines changed

.codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
comment: false
1+
comment: true

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### Directories to ignore:
1+
##### Directories to ignore:
22

33
*.ipynb_checkpoints/
44

@@ -12,7 +12,7 @@ input/
1212

1313
output/
1414

15-
### Files to ignore:
15+
##### Files to ignore:
1616

1717
.DS_Store
1818

.travis.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
addons:
22
apt:
33
packages:
4-
- gfortran
54
- pdf2svg
65
- pgf
76
- poppler-utils
87
- texlive-binaries
98
- texlive-latex-base
109
- texlive-latex-extra
1110
- texlive-pictures
12-
11+
12+
branches:
13+
except:
14+
- gh-pages
15+
1316
git:
1417
depth: 99999999
15-
18+
1619
julia:
1720
- 0.6
1821
- nightly
@@ -45,10 +48,10 @@ before_install:
4548
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install pdf2svg; fi
4649

4750
script:
48-
- julia --check-bounds=yes --color=yes -e 'Pkg.clone(pwd())'
51+
- julia --check-bounds=yes --color=yes -e 'Pkg.clone(pwd(), "PredictMD")'
4952
- julia --check-bounds=yes --color=yes -e 'Pkg.build("PredictMD")'
5053
- julia --check-bounds=yes --color=yes -e 'import PredictMD'
51-
- julia --check-bounds=yes --color=yes -e 'Pkg.test("PredictMD", coverage=true)'
54+
- julia --check-bounds=yes --color=yes -e 'Pkg.test("PredictMD"; coverage=true)'
5255

5356
after_success:
5457
- julia --check-bounds=yes --color=yes -e 'cd(Pkg.dir("PredictMD")); include(joinpath("docs", "deploy_docs.jl"))'

CONTRIBUTING.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,15 @@ An commit message editor will open. Type an appropriate commit message (e.g. "Bu
238238
git push origin release/v30.771.0
239239
```
240240

241-
**Step 10:** Wait for the Travis tests to pass. You can check on the status of the tests by going to [https://travis-ci.org/bcbi/PredictMD.jl/branches](https://travis-ci.org/bcbi/PredictMD.jl/branches) and clicking on your release branch.
241+
**Step 10:** Wait for all of the tests to pass. You can check on the status of the tests by going to [https://github.com/bcbi/PredictMD.jl/branches/yours](https://github.com/bcbi/PredictMD.jl/branches/yours) and scrolling down to find your release branch.
242242

243-
**You must wait for all of the tests to pass before you can finish tagging the release.**
243+
* A yellow dot indicates that the tests are still running. Click on the yellow dot to see which tests are still running.
244+
* A red "X" indicates that one or more of the tests failed. Click on the red "X" to see which tests failed.
245+
* A green check mark indicates that all of the tests passed.
244246

245-
*Sometimes, one of the build jobs will fail because a download timed out. This is especially common with the Mac builds. If this happens, just click on the job, and then click the "Restart job" button.*
247+
**You must wait for all of the tests to pass (green check mark) before you can finish tagging the release.**
248+
249+
*Sometimes, one of the build jobs will fail because a download timed out. This is especially common with the Mac builds on Travis. You can usually resolve this error by restarting the failed build.*
246250

247251
**Step 11:** Once all of the Travis tests have passed, you can finish tagging your release using the git-flow tools:
248252

README.md

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,36 @@
1-
# PredictMD
1+
# [PredictMD](https://www.predictmd.net) - Uniform interface for machine learning in Julia
2+
3+
## Current release: <a href="https://github.com/bcbi/PredictMD.jl/releases/latest"><img alt="Latest release" title="Latest release" src="https://img.shields.io/github/release/bcbi/PredictMD.svg"></a>
24

35
<table>
46
<thead>
57
<tr>
6-
<th>branch</th>
7-
<th>travis</th>
8-
<th>docs</th>
8+
<th>Branch</th>
9+
<th>Description</th>
10+
<th>Docs</th>
11+
<th>Travis</th>
12+
<th>AppVeyor</th>
913
</tr>
1014
</thead>
1115
<tbody>
1216
<tr>
1317
<td>master</td>
14-
<td><a href="https://travis-ci.org/bcbi/PredictMD.jl/branches"><img alt="Travis build status (master)" title="Travis build status (master)" src="https://travis-ci.org/bcbi/PredictMD.jl.svg?branch=master"></a></td>
18+
<td>Current release (stable)</td>
1519
<td><a href="https://www.predictmd.net/stable"><img alt="Documentation (stable)" title="Documentation (stable)" src="https://img.shields.io/badge/docs-stable-blue.svg"></a></td>
20+
<td><a href="https://travis-ci.org/bcbi/PredictMD.jl/branches"><img alt="Travis build status (master)" title="Travis build status (master)" src="https://travis-ci.org/bcbi/PredictMD.jl.svg?branch=master"></a></td>
21+
<td><a href="https://ci.appveyor.com/project/mirestrepo/predictmd-jl/history"><img alt="AppVeyor build status (master)" title="AppVeyor build status (master)" src="https://ci.appveyor.com/api/projects/status/github/bcbi/PredictMD.jl?branch=master&svg=true"></a></td>
1622
</tr>
1723
<tr>
1824
<td>develop</td>
19-
<td><a href="https://travis-ci.org/bcbi/PredictMD.jl/branches"><img alt="Travis build status (develop)" title="Travis build status (develop)" src="https://travis-ci.org/bcbi/PredictMD.jl.svg?branch=develop"></a></td>
25+
<td>Development branch (latest)</td>
2026
<td><a href="https://www.predictmd.net/latest"><img alt="Documentation (latest)" title="Documentation (latest)" src="https://img.shields.io/badge/docs-latest-blue.svg"></a></td>
27+
<td><a href="https://travis-ci.org/bcbi/PredictMD.jl/branches"><img alt="Travis build status (develop)" title="Travis build status (develop)" src="https://travis-ci.org/bcbi/PredictMD.jl.svg?branch=develop"></a></td>
28+
<td><a href="https://ci.appveyor.com/project/mirestrepo/predictmd-jl/history"><img alt="AppVeyor build status (develop)" title="AppVeyor build status (develop)" src="https://ci.appveyor.com/api/projects/status/github/bcbi/PredictMD.jl?branch=develop&svg=true"></a></td>
2129
</tr>
2230
</tbody>
2331
</table>
2432

25-
PredictMD is a Julia package that provides a uniform interface for using multiple different statistics and machine learning packages. This document describes how to install and use PredictMD.
33+
[PredictMD](https://www.predictmd.net) is a Julia package that provides a uniform interface for using multiple different statistics and machine learning packages. This document describes how to install and use PredictMD.
2634

2735
<table>
2836
<thead>
@@ -119,7 +127,7 @@ If you receive an error (e.g. "command not found"), download and install pdf2svg
119127

120128
**Step 3:** Paste the following line into Julia and press enter:
121129
```julia
122-
Pkg.init(); Pkg.update(); Pkg.clone("https://github.com/bcbi/PredictMD.jl.git"); Pkg.test("PredictMD");
130+
Pkg.init(); Pkg.update(); Pkg.clone("https://github.com/bcbi/PredictMD.jl.git"); Pkg.update(); import PredictMD; Pkg.test("PredictMD");
123131
```
124132
You will need to wait several minutes while all of the required packages are installed and all of the tests are run.
125133

REQUIRE

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
##### Minimum supported version of Julia: 0.6
12
julia 0.6
23

4+
##### Required Julia packages
35
Atom
46
BenchmarkTools
57
CSVFiles
@@ -21,10 +23,16 @@ NBInclude
2123
NumericalIntegration
2224
PGFPlots
2325
PGFPlotsX
24-
PackageCompiler
2526
ProgressMeter
2627
RDatasets
2728
ROCAnalysis
2829
Requires
2930
ValueHistories
3031
Weave
32+
33+
##### The following Julia packages are not required, but will be used by
34+
##### PredictMD if the user runs `import PACKAGENAME` or `using PACKAGENAME`
35+
# CUDNN
36+
# Clang
37+
# Cxx
38+
# LLVM

appveyor.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
branches:
2+
except:
3+
- gh-pages
4+
5+
environment:
6+
matrix:
7+
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
8+
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
9+
10+
image: Visual Studio 2015
11+
12+
matrix:
13+
fast_finish: true # immediately finish build once one of the jobs fails
14+
# allow_failures:
15+
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
16+
17+
notifications:
18+
- provider: Email
19+
on_build_success: true
20+
on_build_failure: true
21+
on_build_status_changed: true
22+
23+
skip_branch_with_pr: false
24+
25+
skip_non_tags: false
26+
27+
skip_tags: false
28+
29+
version: '{build}'
30+
31+
###############################################################################
32+
33+
install:
34+
- ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
35+
# If there's a newer build queued for the same PR, cancel this build
36+
- ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
37+
https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
38+
Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
39+
throw "There are newer queued builds for this pull request, failing early." }
40+
# Configure Visual Studio build environment
41+
- call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
42+
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
43+
# Download the appropriate Julia Windows binary
44+
- ps: (new-object net.webclient).DownloadFile(
45+
$env:JULIA_URL,
46+
"C:\projects\julia-binary.exe")
47+
# Run Julia installer silently, output to C:\projects\julia
48+
- C:\projects\julia-binary.exe /S /D=C:\projects\julia
49+
50+
build_script:
51+
# Need to convert from shallow to complete for Pkg.clone to work
52+
- IF EXIST .git\shallow (git fetch --unshallow)
53+
- C:\projects\julia\bin\julia --check-bounds=yes --color=yes -e "Pkg.clone(pwd(), \"PredictMD\")"
54+
- C:\projects\julia\bin\julia --check-bounds=yes --color=yes -e "Pkg.build(\"PredictMD\")"
55+
56+
test_script:
57+
- C:\projects\julia\bin\julia --check-bounds=yes --color=yes -e "import PredictMD"
58+
- C:\projects\julia\bin\julia --check-bounds=yes --color=yes -e "Pkg.test(\"PredictMD\")

deps/build.jl

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
# Originally based on https://github.com/KristofferC/PGFPlotsX.jl/blob/master/deps/build.jl
1+
# Parts of this file are based on:
2+
# 1. https://github.com/KristofferC/PGFPlotsX.jl/blob/master/deps/build.jl
23

34
import Crayons
45

6+
srand(999)
7+
8+
Base.flush( Base.STDOUT )
9+
Base.flush( Base.STDERR )
10+
511
const OK = Crayons.Box.GREEN_FG * Crayons.Box.BOLD("OK")
612
const X = Crayons.Box.RED_FG * Crayons.Box.BOLD("X")
713

@@ -56,3 +62,6 @@ const PREAMBLE_PATH = joinpath(@__DIR__, "custom_preamble.tex")
5662
if !isfile(PREAMBLE_PATH)
5763
touch(PREAMBLE_PATH)
5864
end
65+
66+
Base.flush( Base.STDOUT )
67+
Base.flush( Base.STDERR )

docs/deploy_docs.jl

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,37 @@
11
import Documenter
22
import PredictMD
33

4+
srand(999)
5+
6+
Base.flush( Base.STDOUT )
7+
Base.flush( Base.STDERR )
8+
49
ENV["PREDICTMD_IS_DEPLOY_DOCS"] = "true"
510

6-
Documenter.deploydocs(
7-
branch = "gh-pages",
8-
deps = Documenter.Deps.pip(
9-
"mkdocs",
10-
"pygments",
11-
"python-markdown-math",
12-
),
13-
julia = "0.6",
14-
latest = "develop",
15-
osname = "linux",
16-
repo = "github.com/bcbi/PredictMD.jl.git",
17-
target = "site",
18-
)
11+
if is_windows()
12+
warn(
13+
string(
14+
"deploy_docs is not supported on Windows, so skipping",
15+
)
16+
)
17+
else
18+
Documenter.deploydocs(
19+
branch = "gh-pages",
20+
deps = Documenter.Deps.pip(
21+
"mkdocs",
22+
"pygments",
23+
"python-markdown-math",
24+
),
25+
julia = "0.6",
26+
latest = "develop",
27+
osname = "linux",
28+
repo = "github.com/bcbi/PredictMD.jl.git",
29+
target = "site",
30+
)
31+
end
32+
1933

2034
ENV["PREDICTMD_IS_DEPLOY_DOCS"] = "false"
35+
36+
Base.flush( Base.STDOUT )
37+
Base.flush( Base.STDERR )

docs/make_docs.jl

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,35 @@ import Documenter
22
import Literate
33
import PredictMD
44

5+
srand(999)
6+
7+
Base.flush( Base.STDOUT )
8+
Base.flush( Base.STDERR )
9+
510
ENV["PREDICTMD_IS_MAKE_DOCS"] = "true"
611

7-
Documenter.makedocs(
8-
modules = [
9-
PredictMD,
10-
PredictMD.Clean,
11-
PredictMD.GPU,
12-
],
13-
sitename = "PredictMD.jl",
14-
pages = Any[
15-
"index.md",
16-
"library/internals.md",
17-
],
18-
)
12+
if is_windows()
13+
warn(
14+
string(
15+
"make_docs is not supported on Windows, so skipping",
16+
)
17+
)
18+
else
19+
Documenter.makedocs(
20+
modules = [
21+
PredictMD,
22+
PredictMD.Clean,
23+
PredictMD.GPU,
24+
],
25+
sitename = "PredictMD.jl",
26+
pages = Any[
27+
"index.md",
28+
"library/internals.md",
29+
],
30+
)
31+
end
1932

2033
ENV["PREDICTMD_IS_MAKE_DOCS"] = "false"
34+
35+
Base.flush( Base.STDOUT )
36+
Base.flush( Base.STDERR )

0 commit comments

Comments
 (0)