Skip to content

Commit

Permalink
Merge branch 'master' into mh/gap-4.13
Browse files Browse the repository at this point in the history
  • Loading branch information
lgoettgens authored Jul 31, 2024
2 parents f19fae9 + bfcfee3 commit d69ab19
Show file tree
Hide file tree
Showing 334 changed files with 13,207 additions and 3,213 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.julia-version }}
- uses: julia-actions/cache@v1
- uses: julia-actions/cache@v2
if: runner.environment != 'self-hosted'
with:
cache-name: julia-cache;workflow=${{ github.workflow }};julia=${{ matrix.julia-version }};arch=${{ runner.arch }}
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.julia-version }}
- uses: julia-actions/cache@v1
- uses: julia-actions/cache@v2
if: runner.environment != 'self-hosted'
with:
cache-name: julia-cache;workflow=${{ github.workflow }};julia=${{ matrix.julia-version }};arch=${{ runner.arch }}
Expand Down
40 changes: 0 additions & 40 deletions .github/workflows/Invalidations.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/JuliaFormatterCI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
- uses: julia-actions/cache@v1
- uses: julia-actions/cache@v2
- name: 'Check format with JuliaFormatter'
run: |
julia etc/test_formatting.jl
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/NoExperimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: julia-actions/setup-julia@v2
with:
version: '1.10'
- uses: julia-actions/cache@v1
- uses: julia-actions/cache@v2
with:
cache-name: julia-cache;workflow=${{ github.workflow }};julia=1.10;arch=${{ runner.arch }}
include-matrix: false
Expand All @@ -62,7 +62,7 @@ jobs:
uses: julia-actions/setup-julia@v2
with:
version: '1.10'
- uses: julia-actions/cache@v1
- uses: julia-actions/cache@v2
with:
cache-name: julia-cache;workflow=${{ github.workflow }};julia=1.10;arch=${{ runner.arch }}
include-matrix: false
Expand Down
14 changes: 7 additions & 7 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Oscar"
uuid = "f1435218-dba5-11e9-1e4d-f1a5fab5fc13"
authors = ["The OSCAR Team <[email protected]>"]
version = "1.1.0-DEV"
version = "1.2.0-DEV"

[deps]
AbstractAlgebra = "c3fe647b-3220-5bb0-a1ea-a7954cac585d"
Expand All @@ -25,22 +25,22 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
cohomCalg_jll = "5558cf25-a90e-53b0-b813-cadaa3ae7ade"

[compat]
AbstractAlgebra = "0.41.3"
AlgebraicSolving = "0.4.15"
AbstractAlgebra = "0.42.0"
AlgebraicSolving = "0.5.1"
Distributed = "1.6"
GAP = "0.11.1"
Hecke = "0.32.0"
Hecke = "0.33.0"
JSON = "^0.20, ^0.21"
JSON3 = "1.13.2"
LazyArtifacts = "1.6"
Markdown = "1.6"
Nemo = "0.45.0"
Nemo = "0.46.0"
Pkg = "1.6"
Polymake = "0.11.14"
Polymake = "0.11.19"
Random = "1.6"
RandomExtensions = "0.4.3"
Serialization = "1.6"
Singular = "0.23.1"
Singular = "0.23.4"
TOPCOM_jll = "0.17.8"
UUIDs = "1.6"
cohomCalg_jll = "0.32.0"
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ julia> using Oscar
/ _ \ / ___| / ___| / \ | _ \ | Combining ANTIC, GAP, Polymake, Singular
| | | |\___ \| | / _ \ | |_) | | Type "?Oscar" for more information
| |_| | ___) | |___ / ___ \| _ < | Manual: https://docs.oscar-system.org
\___/ |____/ \____/_/ \_\_| \_\ | Version 1.1.0-DEV
\___/ |____/ \____/_/ \_\_| \_\ | Version 1.2.0-DEV
julia> k, a = quadratic_field(-5)
(Imaginary quadratic field defined by x^2 + 5, sqrt(-5))
Expand Down Expand Up @@ -120,7 +119,7 @@ pm::Array<topaz::HomologyGroup<pm::Integer> >
If you have used OSCAR in the preparation of a paper please cite it as described below:

[OSCAR]
OSCAR -- Open Source Computer Algebra Research system, Version 1.0.0,
OSCAR -- Open Source Computer Algebra Research system, Version 1.2.0-DEV,
The OSCAR Team, 2024. (https://www.oscar-system.org)
[OSCAR-book]
Wolfram Decker, Christian Eder, Claus Fieker, Max Horn, Michael Joswig, eds.
Expand All @@ -133,7 +132,7 @@ If you are using BibTeX, you can use the following BibTeX entries:
key = {OSCAR},
organization = {The OSCAR Team},
title = {OSCAR -- Open Source Computer Algebra Research system,
Version 1.0.0},
Version 1.2.0-DEV},
year = {2024},
url = {https://www.oscar-system.org},
}
Expand Down
32 changes: 17 additions & 15 deletions docs/doc.main
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
"Groups/grouphom.md",
"Groups/autgroup.md",
"Groups/grouplib.md",
"Hecke/abelian/introduction.md",
"Hecke/manual/abelian/introduction.md",
"Groups/group_characters.md",
"Groups/recog.md",
"Groups/tom.md",
],

"Rings" => [
Expand All @@ -49,8 +51,8 @@
"Fields/intro.md",
"AbstractAlgebra/field.md",
"Rings/rational.md",
"Hecke/FacElem.md",
"Hecke/class_fields/intro.md",
"Hecke/manual/misc/FacElem.md",
"Hecke/manual/number_fields/class_fields.md",
"AbstractAlgebra/fraction.md",
"Local Fields" => [
"Nemo/padic.md",
Expand All @@ -63,7 +65,7 @@

"Linear Algebra" => [
"LinearAlgebra/intro.md",
"Hecke/sparse/intro.md",
"Hecke/manual/misc/sparse.md",
"AbstractAlgebra/matrix.md",
"AbstractAlgebra/matrix_algebras.md",
"Modules" => [
Expand All @@ -75,23 +77,23 @@
"AbstractAlgebra/module_homomorphism.md",
],
"Quadratic and Hermitian forms" => [
"Hecke/quad_forms/introduction.md",
"Hecke/quad_forms/basics.md",
"Hecke/quad_forms/lattices.md",
"Hecke/quad_forms/genusherm.md",
"Hecke/quad_forms/integer_lattices.md",
"Hecke/quad_forms/Zgenera.md",
"Hecke/quad_forms/discriminant_group.md"
"Hecke/manual/quad_forms/introduction.md",
"Hecke/manual/quad_forms/basics.md",
"Hecke/manual/quad_forms/lattices.md",
"Hecke/manual/quad_forms/genusherm.md",
"Hecke/manual/quad_forms/integer_lattices.md",
"Hecke/manual/quad_forms/Zgenera.md",
"Hecke/manual/quad_forms/discriminant_group.md"
],
],

"Number Theory" => [
"NumberTheory/intro.md",
"Number Fields" => [
"Hecke/number_fields/intro.md",
"Hecke/number_fields/fields.md",
"Hecke/number_fields/elements.md",
"Hecke/number_fields/internal.md",
"Hecke/manual/number_fields/intro.md",
"Hecke/manual/number_fields/fields.md",
"Hecke/manual/number_fields/elements.md",
"Hecke/manual/number_fields/internal.md",
],
"Orders" => [
"Hecke/orders/introduction.md",
Expand Down
Loading

0 comments on commit d69ab19

Please sign in to comment.