Skip to content

Commit

Permalink
Merge branch 'master' into kapple19/uncertainty_ribbon
Browse files Browse the repository at this point in the history
  • Loading branch information
giordano authored Jan 31, 2024
2 parents c8d37bf + 02540d3 commit 8d9c404
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ jobs:
version: ${{ matrix.julia-version }}
arch: ${{ matrix.julia-arch }}
- uses: julia-actions/cache@v1
- uses: julia-actions/julia-buildpkg@latest
- uses: julia-actions/julia-runtest@latest
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/[email protected]
continue-on-error: true
- uses: julia-actions/[email protected]
Expand All @@ -48,7 +48,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
- uses: julia-actions/setup-julia@v1
with:
version: 1
- uses: julia-actions/cache@v1
Expand Down
8 changes: 8 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,19 @@ MeasurementsSpecialFunctionsExt = "SpecialFunctions"
MeasurementsUnitfulExt = "Unitful"

[compat]
Aqua = "0.8"
BaseType = "0.2"
Calculus = "0.4.1, 0.5"
Juno = "0.8"
LinearAlgebra = "<0.0.1, 1"
Printf = "<0.0.1, 1"
QuadGK = "2"
RecipesBase = "0.6.0, 0.7, 0.8, 1.0"
Requires = "0.5.0, 1"
SpecialFunctions = "0.8, 1, 2"
Statistics = "<0.0.1, 1"
Test = "<0.0.1, 1"
Unitful = "1"
julia = "1"

[extras]
Expand Down
5 changes: 1 addition & 4 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@ using Measurements, SpecialFunctions, QuadGK, Calculus, BaseType
using Test, LinearAlgebra, Statistics, Unitful, Printf, Aqua

if !isdefined(Base,:get_extension)
Aqua.test_all(Measurements; project_toml_formatting=false)
Aqua.test_all(Measurements)
else
Aqua.test_all(Measurements; stale_deps=false)
Aqua.test_stale_deps(Measurements; ignore=[:RecipesBase, :Requires])
end
if VERSION v"1.6"
Aqua.test_project_toml_formatting(Measurements)
end

import Base: isapprox
import Measurements: value, uncertainty
Expand Down

0 comments on commit 8d9c404

Please sign in to comment.