Skip to content

Commit 94e3ad2

Browse files
authored
Update CI and add Aqua tests (#151)
* Update CI and add Aqua tests * Fix format * Fix typo
1 parent d443d74 commit 94e3ad2

File tree

12 files changed

+58
-60
lines changed

12 files changed

+58
-60
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
2+
version: 2
3+
updates:
4+
- package-ecosystem: "github-actions"
5+
directory: "/" # Location of package manifests
6+
schedule:
7+
interval: "monthly"

.github/workflows/CI.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ name: CI
33
on:
44
push:
55
branches:
6-
# This is where pull requests from "bors r+" are built.
7-
- staging
8-
# This is where pull requests from "bors try" are built.
9-
- trying
10-
# Build default branch.
116
- main
7+
pull_request:
8+
9+
concurrency:
10+
# Skip intermediate builds: always.
11+
# Cancel intermediate builds: only if it is a pull request build.
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
1214

1315
jobs:
1416
test:
@@ -33,7 +35,7 @@ jobs:
3335
os: windows-latest
3436
arch: x64
3537
steps:
36-
- uses: actions/checkout@v2
38+
- uses: actions/checkout@v3
3739
- uses: julia-actions/setup-julia@v1
3840
with:
3941
version: ${{ matrix.version }}
@@ -45,11 +47,11 @@ jobs:
4547
coverage: ${{ matrix.version == '1' && matrix.os == 'ubuntu-latest' }}
4648
- uses: julia-actions/julia-processcoverage@v1
4749
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
48-
- uses: codecov/codecov-action@v1
50+
- uses: codecov/codecov-action@v3
4951
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
5052
with:
5153
file: lcov.info
52-
- uses: coverallsapp/github-action@master
54+
- uses: coverallsapp/github-action@v2
5355
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
5456
with:
5557
github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/CompatHelper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
CompatHelper:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v3
1313
- name: "Add the General registry via Git"
1414
run: |
1515
import Pkg

.github/workflows/DocPreviewCleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout gh-pages branch
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v3
1313
with:
1414
ref: gh-pages
1515

.github/workflows/Docs.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,11 @@ name: Docs
33
on:
44
push:
55
branches:
6-
# This is where pull requests from "bors r+" are built.
7-
- staging
8-
# This is where pull requests from "bors try" are built.
9-
- trying
10-
# Build master branch.
116
- main
127
tags:
138
# When a new release is available
149
- 'v*'
1510
pull_request:
16-
types: [opened, reopened, synchronize, labeled]
1711

1812
concurrency:
1913
# Skip intermediate builds: always.
@@ -23,19 +17,25 @@ concurrency:
2317

2418
jobs:
2519
docs:
20+
permissions:
21+
contents: write
22+
statuses: write
2623
name: Documentation
27-
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'preview_docs')
2824
runs-on: ubuntu-latest
2925
steps:
30-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v3
3127
- uses: julia-actions/setup-julia@v1
3228
with:
3329
version: '1'
3430
- uses: julia-actions/cache@v1
3531
- uses: julia-actions/julia-buildpkg@v1
36-
- uses: julia-actions/julia-docdeploy@v1
32+
- run: |
33+
julia --project=docs -e '
34+
using Pkg
35+
Pkg.develop(PackageSpec(path=pwd()))
36+
Pkg.instantiate()'
37+
- run: julia --project=docs docs/make.jl
3738
env:
3839
DATADEPS_ALWAYS_ACCEPT: true # Bypass the accept download prompt
3940
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4041
JULIA_DEBUG: Documenter # Print `@debug` statements
41-
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}

.github/workflows/Format.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@ name: Format
33
on:
44
push:
55
branches:
6-
# This is where pull requests from "bors r+" are built.
7-
- staging
8-
# This is where pull requests from "bors try" are built.
9-
- trying
10-
# Build the master branch.
116
- main
127
pull_request:
138

9+
concurrency:
10+
# Skip intermediate builds: always.
11+
# Cancel intermediate builds: only if it is a pull request build.
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
14+
1415
jobs:
1516
format:
1617
runs-on: ubuntu-latest
1718
steps:
18-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
1920
- uses: julia-actions/setup-julia@latest
2021
with:
2122
version: 1

Project.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
1818
Tulip = "6dd1b50a-3aae-11e9-10b5-ef983d2400fa"
1919

2020
[compat]
21+
Aqua = "0.6.5"
2122
DataStructures = "0.17, 0.18"
2223
Distances = "0.10.1"
2324
Distributions = "0.23, 0.24, 0.25"
@@ -29,3 +30,11 @@ SimpleUnPack = "1"
2930
StatsBase = "0.32, 0.33"
3031
Tulip = "0.7.5, 0.8, 0.9"
3132
julia = "1.3"
33+
34+
[extras]
35+
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
36+
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
37+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
38+
39+
[targets]
40+
test = ["Aqua", "Random", "Test"]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Estimation of calibration errors.
99
[![Codecov](https://codecov.io/gh/devmotion/CalibrationErrors.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/devmotion/CalibrationErrors.jl)
1010
[![Coveralls](https://coveralls.io/repos/github/devmotion/CalibrationErrors.jl/badge.svg?branch=main)](https://coveralls.io/github/devmotion/CalibrationErrors.jl?branch=main)
1111
[![Code Style: Blue](https://img.shields.io/badge/code%20style-blue-4495d1.svg)](https://github.com/invenia/BlueStyle)
12-
[![Bors enabled](https://bors.tech/images/badge_small.svg)](https://app.bors.tech/repositories/24611)
12+
[![Aqua QA](https://raw.githubusercontent.com/JuliaTesting/Aqua.jl/master/badge.svg)](https://github.com/JuliaTesting/Aqua.jl)
1313

1414
**There are also [Python](https://github.com/devmotion/pycalibration) and [R](https://github.com/devmotion/rcalibration) interfaces for this package**
1515

bors.toml

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

src/CalibrationErrors.jl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ using Statistics
1717

1818
const OT = ExactOptimalTransport
1919

20-
# estimation
21-
export calibrationerror
22-
2320
# estimators
2421
export ECE, SKCE, UCME
2522

0 commit comments

Comments
 (0)