Skip to content

Commit

Permalink
Merge branch 'master' into lg/compat-extra-weakdeps-defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
lgoettgens authored Oct 24, 2023
2 parents b8d84cf + 69a7655 commit 14e4036
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 532 deletions.
19 changes: 3 additions & 16 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
test:
runs-on: ${{ matrix.os }}
timeout-minutes: 10
timeout-minutes: ${{ matrix.os == 'windows-latest' && 20 || 10 }}
strategy:
matrix:
os: ["ubuntu-latest"]
Expand All @@ -23,22 +23,18 @@ jobs:
- '1.6'
- '1.5'
- '1.4'
- '1.3'
- '1.2'
- '1.1'
- '1.0'
- 'nightly'
include:
- os: windows-latest
julia-version: '1'
- os: windows-latest
julia-version: '1.0'
julia-version: '1.4'
- os: windows-latest
julia-version: 'nightly'
- os: macOS-latest
julia-version: '1'
- os: macOS-latest
julia-version: '1.0'
julia-version: '1.4'
- os: macOS-latest
julia-version: 'nightly'
fail-fast: false
Expand All @@ -49,15 +45,6 @@ jobs:
uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.julia-version }}
- name: Remove compat entry for old julia versions
# This is needed for julia 1.0-1.3, see https://julialang.slack.com/archives/C67910KEH/p1697548190422019?thread_ts=1697546952.011759&cid=C67910KEH
if: matrix.julia-version == '1.0' || matrix.julia-version == '1.1' || matrix.julia-version == '1.2' || matrix.julia-version == '1.3'
shell: julia --project=. --color=yes {0}
run: |
using Pkg.TOML
prj = TOML.parsefile("Project.toml")
delete!(prj["compat"], "Test")
open(io -> TOML.print(io, prj), "Project.toml", "w")
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v3
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- In `test_deps_compat`, the two subtests `check_extras` and `check_weakdeps` are now run by default. ([#202](https://github.com/JuliaTesting/Aqua.jl/pull/202)) [BREAKING]
- The minimum requirement for julia was raised from `1.0` to `1.4`. ([#221](https://github.com/JuliaTesting/Aqua.jl/pull/221))


## [0.7.4] - 2023-10-24
Expand Down
8 changes: 3 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ authors = ["Takafumi Arakaki <aka.tkf@gmail.com> and contributors"]
version = "0.8.0-DEV"

[deps]
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
Compat = "3.12, 4"
Pkg = "1.0"
Test = "1.0"
julia = "1.0"
Pkg = "1.4"
Test = "1.4"
julia = "1.4"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
11 changes: 6 additions & 5 deletions src/Aqua.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ using Base: PkgId, UUID
using Pkg: Pkg, TOML
using Test

@static if VERSION < v"1.3.0-DEV.349"
using Compat: findfirst
@static if VERSION >= v"1.7-"
const VersionSpec = Pkg.Versions.VersionSpec
const semver_spec = Pkg.Versions.semver_spec
else
const VersionSpec = Pkg.Types.VersionSpec
const semver_spec = Pkg.Types.semver_spec
end

include("pkg/Versions.jl")
using .Versions: VersionSpec, semver_spec

include("utils.jl")
include("ambiguities.jl")
include("unbound_args.jl")
Expand Down
23 changes: 0 additions & 23 deletions src/pkg/LICENSE.md

This file was deleted.

Loading

0 comments on commit 14e4036

Please sign in to comment.