Skip to content

Commit e9728b2

Browse files
committed
Merge branch 'StatsBase' (into which master is merged) into nl/weightedstats
2 parents 655803e + 3e0e172 commit e9728b2

File tree

9 files changed

+499
-202
lines changed

9 files changed

+499
-202
lines changed

.ci/test_and_change_uuid.jl

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
@static if Base.VERSION >= v"1.6"
2+
using TOML
3+
using Test
4+
else
5+
using Pkg: TOML
6+
using Test
7+
end
8+
9+
# To generate the new UUID, we simply modify the first character of the original UUID
10+
const original_uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
11+
const new_uuid = "20745b16-79ce-11e8-11f9-7d13ad32a3b2"
12+
13+
# `@__DIR__` is the `.ci/` folder.
14+
# Therefore, `dirname(@__DIR__)` is the repository root.
15+
const project_filename = joinpath(dirname(@__DIR__), "Project.toml")
16+
17+
@testset "Test that the UUID is unchanged" begin
18+
project_dict = TOML.parsefile(project_filename)
19+
@test project_dict["uuid"] == original_uuid
20+
end
21+
22+
write(
23+
project_filename,
24+
replace(
25+
read(project_filename, String),
26+
r"uuid = .*?\n" => "uuid = \"$(new_uuid)\"\n",
27+
),
28+
)

.github/workflows/ci.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: CI
2+
on:
3+
push:
4+
branches: [master]
5+
tags: ["*"]
6+
pull_request:
7+
jobs:
8+
test:
9+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
10+
runs-on: ${{ matrix.os }}
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
version:
15+
- '1' # automatically expands to the latest stable 1.x release of Julia
16+
- 'nightly'
17+
os:
18+
- ubuntu-latest
19+
- macOS-latest
20+
- windows-latest
21+
arch:
22+
- x64
23+
- x86
24+
exclude:
25+
- os: macOS-latest
26+
arch: x86
27+
steps:
28+
- uses: actions/checkout@v2
29+
- uses: julia-actions/setup-julia@v1
30+
with:
31+
version: ${{ matrix.version }}
32+
arch: ${{ matrix.arch }}
33+
- uses: actions/cache@v1
34+
env:
35+
cache-name: cache-artifacts
36+
with:
37+
path: ~/.julia/artifacts
38+
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
39+
restore-keys: |
40+
${{ runner.os }}-test-${{ env.cache-name }}-
41+
${{ runner.os }}-test-
42+
${{ runner.os }}-
43+
- run: julia --color=yes .ci/test_and_change_uuid.jl
44+
- uses: julia-actions/julia-buildpkg@v1
45+
- uses: julia-actions/julia-runtest@v1
46+
- uses: julia-actions/julia-processcoverage@v1
47+
- uses: codecov/codecov-action@v1
48+
with:
49+
file: lcov.info
50+
docs:
51+
name: Documentation
52+
runs-on: ubuntu-latest
53+
steps:
54+
- uses: actions/checkout@v2
55+
- uses: julia-actions/setup-julia@v1
56+
with:
57+
version: '1'
58+
- run: |
59+
julia --project=docs -e '
60+
using Pkg
61+
Pkg.develop(PackageSpec(path=pwd()))
62+
Pkg.instantiate()'
63+
- run: julia --project=docs docs/make.jl
64+
env:
65+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
66+
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}

.travis.yml

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

appveyor.yml

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

docs/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
33

44
[compat]
5-
Documenter = "~0.22"
5+
Documenter = "0.24"

docs/make.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Documenter, StatsBase, Statistics, Random
1+
using Documenter, Statistics, Random
22

33
# Workaround for JuliaLang/julia/pull/28625
44
if Base.HOME_PROJECT[] !== nothing
@@ -28,4 +28,4 @@ makedocs(
2828

2929
deploydocs(
3030
repo = "github.com/JuliaStats/StatsBase.jl.git"
31-
)
31+
)

0 commit comments

Comments
 (0)