diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index bb584993b2..d22cfb2324 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -23,7 +23,6 @@ jobs: matrix: julia-version: - '1.6' - - '1.7' - '1.8' - '~1.9.0-0' - 'nightly' @@ -31,9 +30,9 @@ jobs: - ubuntu-latest include: # Add a few windows and macOS jobs (not too many, the number we can run in parallel is limited) - - julia-version: '1.6' + - julia-version: '1.8' os: macOS-latest - - julia-version: '1.6' + - julia-version: '1.8' os: windows-latest steps: @@ -64,7 +63,7 @@ jobs: with: depwarn: error - name: "Run doctests" - if: ${{ matrix.julia-version == '1.6' }} + if: ${{ matrix.julia-version == '1.8' }} run: | julia --project=docs --color=yes --code-coverage -e ' using Pkg @@ -87,7 +86,7 @@ jobs: - uses: actions/checkout@v3 - uses: julia-actions/setup-julia@v1 with: - version: '1.6' + version: '1.8' - name: Cache artifacts uses: actions/cache@v3 env: diff --git a/.github/workflows/oscar.yml b/.github/workflows/oscar.yml index 636f3c2929..1af071b66b 100644 --- a/.github/workflows/oscar.yml +++ b/.github/workflows/oscar.yml @@ -1,12 +1,13 @@ name: OscarCI on: - push: + pull_request: branches: - master - pull_request: + push: branches: - master + workflow_dispatch: concurrency: # group by workflow and ref; the last slightly strange component ensures that for pull @@ -28,7 +29,7 @@ jobs: - name: "Set up Julia" uses: julia-actions/setup-julia@v1 with: - version: '~1.6.0-0' + version: '~1.8.0-0' - name: OscarDevTools - CI if: github.repository == 'oscar-system/OscarDevTools.jl' run: | @@ -82,6 +83,7 @@ jobs: Pkg.add(PackageSpec(name=\"OscarDevTools\",version=\"0.2\")); Pkg.instantiate();" - name: "Set up Oscar-dev configuration" + id: setupdev env: MATRIX_CONTEXT: ${{ toJSON(matrix) }} run: | @@ -99,11 +101,12 @@ jobs: filename=\"${GITHUB_ENV}\");" - name: "Run tests" + if: steps.setupdev.outputs.skiptests != 'true' run: | echo '${{ env.oscar_run_tests }}' julia --project=oscar-dev/project/ -e '${{ env.oscar_run_tests }}' - name: "Run doctests" - if: matrix.julia-version == '~1.6.0-0' || matrix.julia-version == '1.6' + if: steps.setupdev.outputs.skiptests != 'true' && (matrix.julia-version == '~1.8.0-0' || matrix.julia-version == '1.8') run: | echo '${{ env.oscar_run_doctests }}' julia --project=oscar-dev/project/ -e '${{ env.oscar_run_doctests }}' diff --git a/docs/src/fraction.md b/docs/src/fraction.md index 1bd686a1c1..9a20c5812f 100644 --- a/docs/src/fraction.md +++ b/docs/src/fraction.md @@ -373,7 +373,7 @@ julia> K = fraction_field(ZZ) Rationals julia> f = rand(K, -10:10) --1//1 +-1//3 julia> R, x = polynomial_ring(ZZ, "x") (Univariate Polynomial Ring in x over Integers, x) @@ -382,7 +382,7 @@ julia> S = fraction_field(R) Fraction field of Univariate Polynomial Ring in x over Integers julia> g = rand(S, -1:3, -10:10) -(-8*x^2 + 4*x + 6)//(8*x^3 - 5*x^2 + 6*x - 10) +(-4*x - 4)//(4*x^2 + x - 4) ``` ### Extra functionality for factored fractions diff --git a/docs/src/module.md b/docs/src/module.md index 26ad4f3b02..49b8ab4bbb 100644 --- a/docs/src/module.md +++ b/docs/src/module.md @@ -220,10 +220,10 @@ julia> M = FreeModule(ZZ, 3) Free module of rank 3 over Integers julia> m1 = rand(M, -10:10) -(5, -5, 2) +(3, -1, 0) julia> m2 = rand(M, -10:10) -(-6, -4, 8) +(4, 4, -7) julia> S, f = sub(M, [m1, m2]) (Submodule over Integers with 2 generators and no relations, Module homomorphism with @@ -259,10 +259,10 @@ julia> M = FreeModule(ZZ, 3) Free module of rank 3 over Integers julia> m1 = rand(M, -10:10) -(5, -5, 2) +(3, -1, 0) julia> m2 = rand(M, -10:10) -(-6, -4, 8) +(4, 4, -7) julia> S, f = sub(M, [m1, m2]) (Submodule over Integers with 2 generators and no relations, Module homomorphism with @@ -271,20 +271,19 @@ Codomain: Free module of rank 3 over Integers) julia> Q, g = quo(M, S) (Quotient module over Integers with 2 generators and relations: -[50 -52], Module homomorphism with +[16 -21], Module homomorphism with Domain: Free module of rank 3 over Integers Codomain: Quotient module over Integers with 2 generators and relations: -[50 -52]) +[16 -21]) julia> I, f = snf(Q) -(Invariant factor decomposed module over Integers with invariant factors BigInt[2, 0], Module isomorphism with -Domain: Invariant factor decomposed module over Integers with invariant factors BigInt[2, 0] +(Invariant factor decomposed module over Integers with invariant factors BigInt[0], Module isomorphism with +Domain: Invariant factor decomposed module over Integers with invariant factors BigInt[0] Codomain: Quotient module over Integers with 2 generators and relations: -[50 -52]) +[16 -21]) julia> invs = invariant_factors(Q) -2-element Vector{BigInt}: - 2 +1-element Vector{BigInt}: 0 ``` diff --git a/docs/src/mpolynomial.md b/docs/src/mpolynomial.md index afecfff702..cca378fc2c 100644 --- a/docs/src/mpolynomial.md +++ b/docs/src/mpolynomial.md @@ -939,11 +939,11 @@ julia> R, (x, y) = polynomial_ring(ZZ, ["x", "y"]) (Multivariate Polynomial Ring in x, y over Integers, AbstractAlgebra.Generic.MPoly{BigInt}[x, y]) julia> f = rand(R, -1:2, 3:5, -10:10) --6*x^3*y^4 +4*x^4*y^4 julia> S, (s, t) = polynomial_ring(GF(7), ["x", "y"]) (Multivariate Polynomial Ring in x, y over Finite field F_7, AbstractAlgebra.Generic.MPoly{AbstractAlgebra.GFElem{Int64}}[x, y]) julia> g = rand(S, -1:2, 3:5) -0 +4*x^3*y^4 ``` diff --git a/docs/src/residue.md b/docs/src/residue.md index 1995ec5e54..923335fd2d 100644 --- a/docs/src/residue.md +++ b/docs/src/residue.md @@ -327,7 +327,7 @@ julia> R = residue_ring(ZZ, 7) Residue ring of Integers modulo 7 julia> f = rand(R, 0:6) -5 +4 julia> S, x = polynomial_ring(QQ, "x") (Univariate Polynomial Ring in x over Rationals, x) @@ -336,5 +336,5 @@ julia> U = residue_field(S, x^3 + 3x + 1) Residue field of Univariate Polynomial Ring in x over Rationals modulo x^3 + 3*x + 1 julia> g = rand(S, 2:2, -10:10) --7//10*x^2 - 2*x - 3 +-1//4*x^2 - 2//7*x + 1 ``` diff --git a/docs/src/series.md b/docs/src/series.md index 10bca491df..35f7264b6f 100644 --- a/docs/src/series.md +++ b/docs/src/series.md @@ -743,5 +743,5 @@ julia> R, x = power_series_ring(ZZ, 10, "x") (Univariate power series ring in x over Integers, x + O(x^11)) julia> f = rand(R, 3:5, -10:10) -5*x^5 - 5*x^6 + 2*x^7 - 6*x^8 - 4*x^9 + 8*x^10 - 10*x^11 + 7*x^12 + 10*x^13 - 6*x^14 + O(x^15) +3*x^4 - x^5 + 4*x^7 + 4*x^8 - 7*x^9 + 2*x^10 + 4*x^11 - x^12 - 4*x^13 + O(x^14) ``` diff --git a/docs/src/submodule.md b/docs/src/submodule.md index c584fa0954..8b27b13d20 100644 --- a/docs/src/submodule.md +++ b/docs/src/submodule.md @@ -184,5 +184,5 @@ Domain: Submodule over Integers with 1 generator and no relations Codomain: Free module of rank 2 over Integers) julia> I = intersect(N1, N2) -Union{AbstractAlgebra.Generic.ModuleHomomorphism{BigInt}, AbstractAlgebra.Generic.Submodule{BigInt}}[] +Any[] ``` diff --git a/docs/src/total_fraction.md b/docs/src/total_fraction.md index 5c211f8cd6..b7c3e08e10 100644 --- a/docs/src/total_fraction.md +++ b/docs/src/total_fraction.md @@ -272,7 +272,7 @@ julia> K = total_ring_of_fractions(R) Total ring of fractions of Residue ring of Integers modulo 12 julia> f = rand(K, 0:11) -8//7 +7//5 julia> R, x = polynomial_ring(ZZ, "x") (Univariate Polynomial Ring in x over Integers, x) @@ -281,5 +281,5 @@ julia> S = total_ring_of_fractions(R) Total ring of fractions of Univariate Polynomial Ring in x over Integers julia> g = rand(S, -1:3, -10:10) --4//(-6*x^3 + 10*x^2 + 7*x - 10) +(4*x + 4)//(-4*x^2 - x + 4) ```