Skip to content

Commit

Permalink
Revert "Drop support for julia 1.0-1.3 (#221)" (#224)
Browse files Browse the repository at this point in the history
  • Loading branch information
lgoettgens authored Nov 5, 2023
1 parent 0979329 commit 3ea2897
Show file tree
Hide file tree
Showing 10 changed files with 521 additions and 39 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ concurrency:
jobs:
test:
runs-on: ${{ matrix.os }}
timeout-minutes: ${{ matrix.os == 'windows-latest' && 20 || 10 }}
timeout-minutes: 10
strategy:
matrix:
os: ["ubuntu-latest"]
Expand All @@ -30,18 +30,22 @@ 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.4'
julia-version: '1.0'
- os: windows-latest
julia-version: 'nightly'
- os: macOS-latest
julia-version: '1'
- os: macOS-latest
julia-version: '1.4'
julia-version: '1.0'
- os: macOS-latest
julia-version: 'nightly'
fail-fast: false
Expand Down
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- The minimum requirement for julia was raised from `1.0` to `1.4`. ([#221](https://github.com/JuliaTesting/Aqua.jl/pull/221))
- `test_ambiguities` now excludes the keyword sorter of all `exclude`d functions with keyword arguments as well. ([#203](https://github.com/JuliaTesting/Aqua.jl/pull/204))
- 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]
- `test_deps_compat` now reqiures compat entries for all dependencies. Stdlibs no longer get ignored. This change is motivated by similar changes in the General registry. ([#215](https://github.com/JuliaTesting/Aqua.jl/pull/215)) [BREAKING]
Expand Down
8 changes: 5 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ 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]
Pkg = "1.4"
Test = "1.4"
julia = "1.4"
Compat = "3.12, 4"
Pkg = "1.0"
Test = "<0.0.1, 1"
julia = "1.0"

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

@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
@static if VERSION < v"1.3.0-DEV.349"
using Compat: findfirst
end

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

include("utils.jl")
include("ambiguities.jl")
include("unbound_args.jl")
Expand Down
5 changes: 5 additions & 0 deletions src/persistent_tasks.jl
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ end
In more complex cases, you may need to set up independently-callable functions
to launch the tasks and set conditions that allow them to cleanly exit.
On Julia version 1.9 and before, this test always succeeds.
# Arguments
- `package`: a top-level `Module` or `Base.PkgId`.
Expand Down Expand Up @@ -115,6 +117,9 @@ function find_persistent_tasks_deps(package::Module; kwargs...)
end

function precompile_wrapper(project, tmax)
if VERSION < v"1.10.0-"
return true
end
prev_project = Base.active_project()
isdefined(Pkg, :respect_sysimage_versions) && Pkg.respect_sysimage_versions(false)
try
Expand Down
23 changes: 23 additions & 0 deletions src/pkg/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
The Pkg.jl package is licensed under the MIT "Expat" License:

> Copyright (c) 2017-2021: Stefan Karpinski, Kristoffer Carlsson, Fredrik Ekre, David Varela, Ian Butterworth, and contributors:
> https://github.com/JuliaLang/Pkg.jl/graphs/contributors
>
> Permission is hereby granted, free of charge, to any person obtaining a copy
> of this software and associated documentation files (the "Software"), to deal
> in the Software without restriction, including without limitation the rights
> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> copies of the Software, and to permit persons to whom the Software is
> furnished to do so, subject to the following conditions:
>
> The above copyright notice and this permission notice shall be included in all
> copies or substantial portions of the Software.
>
> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> SOFTWARE.
>
Loading

0 comments on commit 3ea2897

Please sign in to comment.