From f504f48e5e084050ff5cbc35ef3167ace1655a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= Date: Sun, 31 Dec 2023 00:53:52 +0100 Subject: [PATCH 1/5] Bump default julia to 1.10 --- .github/workflows/oscar-doctest.yml | 2 +- .github/workflows/oscar.yml | 2 +- src/defaults.jl | 2 +- test/meta/OscarCI-doctest.toml | 4 ++-- test/meta/OscarCI-julia.toml | 2 +- test/meta/OscarCI.toml | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/oscar-doctest.yml b/.github/workflows/oscar-doctest.yml index f8eae23..77ed6c5 100644 --- a/.github/workflows/oscar-doctest.yml +++ b/.github/workflows/oscar-doctest.yml @@ -29,7 +29,7 @@ jobs: - name: "Set up Julia" uses: julia-actions/setup-julia@v1 with: - version: '~1.9.0-0' + version: '1.10' - name: OscarDevTools - CI if: github.repository == 'oscar-system/OscarDevTools.jl' run: | diff --git a/.github/workflows/oscar.yml b/.github/workflows/oscar.yml index 55907ed..2c8975e 100644 --- a/.github/workflows/oscar.yml +++ b/.github/workflows/oscar.yml @@ -29,7 +29,7 @@ jobs: - name: "Set up Julia" uses: julia-actions/setup-julia@v1 with: - version: '~1.9.0-0' + version: '1.10' - name: OscarDevTools - CI if: github.repository == 'oscar-system/OscarDevTools.jl' run: | diff --git a/src/defaults.jl b/src/defaults.jl index cb8f7a2..b7795d6 100644 --- a/src/defaults.jl +++ b/src/defaults.jl @@ -2,7 +2,7 @@ ### defaults for julia-version, os and branches const default_os = [ "ubuntu-latest" ] -const default_julia = [ "~1.6.0-0", "~1.9.0-0" ] +const default_julia = [ "~1.6.0-0", "~1.10.0-0" ] const default_branches = [ "", "release" ] # for each package this contains an ordered list with diff --git a/test/meta/OscarCI-doctest.toml b/test/meta/OscarCI-doctest.toml index 482c545..b744b54 100644 --- a/test/meta/OscarCI-doctest.toml +++ b/test/meta/OscarCI-doctest.toml @@ -5,7 +5,7 @@ title = "metadata for oscar CI run" # the pull request and use master if that cannot be found [env] # os = [ "ubuntu-latest" ] -# julia-version = [ "~1.9.0-0" ] +# julia-version = [ "~1.10.0-0" ] # branches = [ "", "release" ] # pkgs without branches specified will use the global branches axis @@ -29,5 +29,5 @@ title = "metadata for oscar CI run" [include.macos] Singular = "" os = "macos-latest" - julia-version = "~1.9.0-0" + julia-version = "~1.10.0-0" diff --git a/test/meta/OscarCI-julia.toml b/test/meta/OscarCI-julia.toml index 8641d57..ac3c4a9 100644 --- a/test/meta/OscarCI-julia.toml +++ b/test/meta/OscarCI-julia.toml @@ -3,7 +3,7 @@ title = "metadata for oscar CI run" # keep it small to prevent job-explosion [env] os = [ "ubuntu-latest" ] -julia-version = [ "~1.6.0-0", "~1.9.0-0", "nightly" ] +julia-version = [ "~1.6.0-0", "~1.10.0-0", "nightly" ] # for OscarDevTools we mostly use release versions [pkgs] diff --git a/test/meta/OscarCI.toml b/test/meta/OscarCI.toml index 482c545..b744b54 100644 --- a/test/meta/OscarCI.toml +++ b/test/meta/OscarCI.toml @@ -5,7 +5,7 @@ title = "metadata for oscar CI run" # the pull request and use master if that cannot be found [env] # os = [ "ubuntu-latest" ] -# julia-version = [ "~1.9.0-0" ] +# julia-version = [ "~1.10.0-0" ] # branches = [ "", "release" ] # pkgs without branches specified will use the global branches axis @@ -29,5 +29,5 @@ title = "metadata for oscar CI run" [include.macos] Singular = "" os = "macos-latest" - julia-version = "~1.9.0-0" + julia-version = "~1.10.0-0" From 75b619c7e1abce24de1ff2748d8fe6a4bbad6419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= Date: Sun, 31 Dec 2023 00:54:15 +0100 Subject: [PATCH 2/5] Bump version --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 2457fb0..6bcc421 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "OscarDevTools" uuid = "4f01c588-2833-446a-9dbd-6331d80acb41" authors = ["Benjamin Lorenz "] -version = "0.2.14" +version = "0.2.15" [deps] GitHub = "bc5e4493-9b4d-5f90-b8aa-2b2bcaad7a26" From 9f8d35e5de934cab79faadb2457a16da5f193326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= Date: Sun, 31 Dec 2023 00:59:31 +0100 Subject: [PATCH 3/5] Update doctest defaults --- src/defaults.jl | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/defaults.jl b/src/defaults.jl index b7795d6..daa7272 100644 --- a/src/defaults.jl +++ b/src/defaults.jl @@ -11,16 +11,21 @@ const default_branches = [ "", "release" ] # newest entries should come first # if no matching version is found the doctests will run with julia 1.6 const doctest_versions = Dict( - :Oscar => [v"0.13.0-DEV" => (v"1.9", v"1.12"), - v"0.12.1-DEV" => (v"1.8", v"1.11")], - :Hecke => [v"0.19.5" => (v"1.9", v"1.10" ), - v"0.16.7" => (v"1.8", v"1.9" )], - :AbstractAlgebra => [v"0.31.0" => (v"1.9", v"1.10"), - v"0.29.5" => (v"1.8", v"1.9" )], - :Nemo => [v"0.35.1" => (v"1.9", v"1.10" ), - v"0.33.8" => (v"1.8", v"1.9" )], - :Singular => [v"0.18.8" => (v"1.9", v"1.10" ), - v"0.18.3" => (v"1.8", v"1.9" )], + :Oscar => [v"0.14.0-DEV" => (v"1.10", v"1.13"), + v"0.13.0-DEV" => (v"1.9" , v"1.11"), + v"0.12.1-DEV" => (v"1.8" , v"1.11")], + :Hecke => [v"0.23.4" => (v"1.10", v"1.11"), + v"0.19.5" => (v"1.9" , v"1.10"), + v"0.16.7" => (v"1.8" , v"1.9" )], + :AbstractAlgebra => [v"0.34.8" => (v"1.10", v"1.11"), + v"0.31.0" => (v"1.9" , v"1.10"), + v"0.29.5" => (v"1.8" , v"1.9" )], + :Nemo => [v"0.38.4" => (v"1.10", v"1.11"), + v"0.35.1" => (v"1.9" , v"1.10"), + v"0.33.8" => (v"1.8" , v"1.9" )], + :Singular => [v"0.21.2" => (v"1.10", v"1.11"), + v"0.18.8" => (v"1.9" , v"1.10"), + v"0.18.3" => (v"1.8" , v"1.9" )], ) ### end defaults From e8b13aed427871619ffecd9e3c06ae97f063fe92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= Date: Mon, 22 Jan 2024 18:15:41 +0100 Subject: [PATCH 4/5] Apply suggestions from code review --- src/defaults.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/defaults.jl b/src/defaults.jl index daa7272..c729b66 100644 --- a/src/defaults.jl +++ b/src/defaults.jl @@ -14,16 +14,16 @@ const doctest_versions = Dict( :Oscar => [v"0.14.0-DEV" => (v"1.10", v"1.13"), v"0.13.0-DEV" => (v"1.9" , v"1.11"), v"0.12.1-DEV" => (v"1.8" , v"1.11")], - :Hecke => [v"0.23.4" => (v"1.10", v"1.11"), + :Hecke => [v"0.24.1" => (v"1.10", v"1.11"), v"0.19.5" => (v"1.9" , v"1.10"), v"0.16.7" => (v"1.8" , v"1.9" )], - :AbstractAlgebra => [v"0.34.8" => (v"1.10", v"1.11"), + :AbstractAlgebra => [v"0.35.3" => (v"1.10", v"1.11"), v"0.31.0" => (v"1.9" , v"1.10"), v"0.29.5" => (v"1.8" , v"1.9" )], - :Nemo => [v"0.38.4" => (v"1.10", v"1.11"), + :Nemo => [v"0.40.0" => (v"1.10", v"1.11"), v"0.35.1" => (v"1.9" , v"1.10"), v"0.33.8" => (v"1.8" , v"1.9" )], - :Singular => [v"0.21.2" => (v"1.10", v"1.11"), + :Singular => [v"0.21.3" => (v"1.10", v"1.11"), v"0.18.8" => (v"1.9" , v"1.10"), v"0.18.3" => (v"1.8" , v"1.9" )], ) From 161e8295e1bff2552242b133dd7e2e83c3eacf1a Mon Sep 17 00:00:00 2001 From: Benjamin Lorenz Date: Tue, 23 Jan 2024 10:32:24 +0100 Subject: [PATCH 5/5] Update src/defaults.jl --- src/defaults.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/defaults.jl b/src/defaults.jl index c729b66..24fd2d9 100644 --- a/src/defaults.jl +++ b/src/defaults.jl @@ -11,7 +11,7 @@ const default_branches = [ "", "release" ] # newest entries should come first # if no matching version is found the doctests will run with julia 1.6 const doctest_versions = Dict( - :Oscar => [v"0.14.0-DEV" => (v"1.10", v"1.13"), + :Oscar => [v"0.14.0-DEV" => (v"1.10", v"1.12"), v"0.13.0-DEV" => (v"1.9" , v"1.11"), v"0.12.1-DEV" => (v"1.8" , v"1.11")], :Hecke => [v"0.24.1" => (v"1.10", v"1.11"),