From 78ad4ac706901b87eb124643cc125aa71d1b152d Mon Sep 17 00:00:00 2001 From: Benjamin Lorenz Date: Tue, 16 Apr 2024 14:38:23 +0200 Subject: [PATCH 1/2] booktest: make path filter more robust (#3613) (cherry picked from commit 993d3fcf7fd32596cdca0f04353ef89c23124fe8) --- test/book/test.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/book/test.jl b/test/book/test.jl index d8ffb25fa51f..b22b70fb7897 100644 --- a/test/book/test.jl +++ b/test/book/test.jl @@ -53,7 +53,7 @@ isdefined(Main, :FakeTerminals) || include(joinpath(pkgdir(REPL),"test","FakeTer # remove timings result = replace(result, r"^\s*[0-9\.]+ seconds \(.* allocations: .*\)$"m => "\n") # this removes the package version slug, filename and linenumber - result = replace(result, r" @ \w* ?~/\.julia/packages/(?:Nemo|Hecke|AbstractAlgebra|Polymake)/\K[\w\d]+/.*\.jl:\d+"m => "") + result = replace(result, r"^(.* @ \w* ?)~?/[\w/.-]*(Nemo|Hecke|AbstractAlgebra|Polymake)(?:\.jl)?/[\w\d]+/.*\.jl:\d+"m => s"\1 \2") lafter = length(result) end return strip(result) From c3e67f2c753edf0d0f303c8fe664e5821bc612fa Mon Sep 17 00:00:00 2001 From: Benjamin Lorenz Date: Wed, 17 Apr 2024 17:18:28 +0200 Subject: [PATCH 2/2] Version 1.0.2 --- Project.toml | 2 +- README.md | 6 +++--- gap/OscarInterface/PackageInfo.g | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Project.toml b/Project.toml index 25df4f8a01e4..7e5beff9de27 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Oscar" uuid = "f1435218-dba5-11e9-1e4d-f1a5fab5fc13" authors = ["The OSCAR Team "] -version = "1.0.1" +version = "1.0.2" [deps] AbstractAlgebra = "c3fe647b-3220-5bb0-a1ea-a7954cac585d" diff --git a/README.md b/README.md index 7ef276c0a44c..d66d1182c67c 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ julia> using Oscar / _ \ / ___| / ___| / \ | _ \ | Combining ANTIC, GAP, Polymake, Singular | | | |\___ \| | / _ \ | |_) | | Type "?Oscar" for more information | |_| | ___) | |___ / ___ \| _ < | Manual: https://docs.oscar-system.org - \___/ |____/ \____/_/ \_\_| \_\ | Version 1.0.1 + \___/ |____/ \____/_/ \_\_| \_\ | Version 1.0.2 julia> k, a = quadratic_field(-5) (Imaginary quadratic field defined by x^2 + 5, sqrt(-5)) @@ -120,7 +120,7 @@ pm::Array > 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.1, + OSCAR -- Open Source Computer Algebra Research system, Version 1.0.2, The OSCAR Team, 2024. (https://www.oscar-system.org) [OSCAR-book] Wolfram Decker, Christian Eder, Claus Fieker, Max Horn, Michael Joswig, eds. @@ -133,7 +133,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.1}, + Version 1.0.2}, year = {2024}, url = {https://www.oscar-system.org}, } diff --git a/gap/OscarInterface/PackageInfo.g b/gap/OscarInterface/PackageInfo.g index 54c1a6dcba9b..c0a335590862 100644 --- a/gap/OscarInterface/PackageInfo.g +++ b/gap/OscarInterface/PackageInfo.g @@ -10,7 +10,7 @@ SetPackageInfo( rec( PackageName := "OscarInterface", Subtitle := "GAP interface to OSCAR", -Version := "1.0.1", +Version := "1.0.2", Date := "17/04/2024", # dd/mm/yyyy format License := "GPL-2.0-or-later",