From e66bf8d34d87d13f6cf2be6867bd46fbe04b0e55 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Wed, 5 Feb 2020 15:11:55 +0100 Subject: [PATCH 1/3] Update Travis settings --- .travis.yml | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26b269cae..eb218792c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,14 +13,18 @@ addons: - libmpfr-dev language: julia -sudo: false os: - linux - osx + +codecov: true +coveralls: true + julia: - 1.0 - 1.1 - 1.2 + - 1.3 - nightly matrix: allow_failures: @@ -29,8 +33,8 @@ matrix: notifications: - email: false script: - - while sleep 30; do echo "still alive"; done & - - julia -e 'using Pkg; Pkg.build("Singular"); Pkg.test("Singular");' + - julia --color=yes -e 'using Pkg; if VERSION >= v"1.1.0"; Pkg.build(verbose=true); else Pkg.build(); end;' + - julia --color=yes -e 'using Pkg; Pkg.test();' env: global: @@ -42,14 +46,6 @@ jobs: julia: 1.0 os: linux script: - - while sleep 30; do echo "still alive"; done & - - julia --project=docs/ -e 'using Pkg; Pkg.add(PackageSpec(path=pwd())); Pkg.instantiate();' - - julia --project=docs/ docs/make.jl + - julia --color=yes --project=docs/ -e 'using Pkg; Pkg.add(PackageSpec(path=pwd())); Pkg.instantiate();' + - julia --color=yes --project=docs/ docs/make.jl after_success: skip - -after_success: - # push coverage results to Coveralls - - julia --color=yes -e 'using Pkg; cd(Pkg.dir("Singular")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())' - # push coverage results to Codecov - - julia --color=yes -e 'using Pkg; cd(Pkg.dir("Singular")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())' - From eac56f69f7b2597e7abd9892a7bd6a4298b2dd14 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Thu, 6 Feb 2020 12:13:06 +0100 Subject: [PATCH 2/3] Travis: switch to default script This also turns on bounds check for tests --- .travis.yml | 6 +----- Project.toml | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb218792c..588d7f76a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ coveralls: true julia: - 1.0 - - 1.1 + #- 1.1 # runs into a GC bug - 1.2 - 1.3 - nightly @@ -32,9 +32,6 @@ matrix: - os: osx notifications: - email: false -script: - - julia --color=yes -e 'using Pkg; if VERSION >= v"1.1.0"; Pkg.build(verbose=true); else Pkg.build(); end;' - - julia --color=yes -e 'using Pkg; Pkg.test();' env: global: @@ -48,4 +45,3 @@ jobs: script: - julia --color=yes --project=docs/ -e 'using Pkg; Pkg.add(PackageSpec(path=pwd())); Pkg.instantiate();' - julia --color=yes --project=docs/ docs/make.jl - after_success: skip diff --git a/Project.toml b/Project.toml index 2f08a40a0..baec70c3f 100644 --- a/Project.toml +++ b/Project.toml @@ -15,7 +15,7 @@ BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232" [compat] AbstractAlgebra = "^0.8.0" Nemo = "^0.16.0" -julia = "1.0, 1.1, 1.2" +julia = "1.0, 1.1, 1.2, 1.3" CxxWrap = "^0.8.1" BinaryProvider = "^0.5.8" From 9470589fae8a04b2115894ff2ca5f9e246d2e6f7 Mon Sep 17 00:00:00 2001 From: raulepure Date: Fri, 7 Feb 2020 09:52:06 +0100 Subject: [PATCH 3/3] Fixed typos in "n_transExt.jl", "ideal.jl" and "transExt.md" --- docs/src/transExt.md | 2 +- src/ideal/ideal.jl | 2 +- src/number/n_transExt.jl | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/src/transExt.md b/docs/src/transExt.md index 8647835fa..65c6cdd10 100644 --- a/docs/src/transExt.md +++ b/docs/src/transExt.md @@ -36,7 +36,7 @@ The following constructors are available to create function fields and their ele Singular.FunctionField(::Field, ::Array{String, 1}; ::Bool) ``` -In case the user does not want to specify a transcendece basis the following +In case the user does not want to specify a transcendence basis the following constructor can be used. ```@docs diff --git a/src/ideal/ideal.jl b/src/ideal/ideal.jl index d2e642520..700aeb552 100644 --- a/src/ideal/ideal.jl +++ b/src/ideal/ideal.jl @@ -697,7 +697,7 @@ end > Returns, by default, an array containing a maximal independet set of > $lead(I)$. $I$ has to be given by a Gröbner basis. > If the additional parameter "all" is set to true, an array containing -> all maximal independent sets iof $lead(I)$ is returned. +> all maximal independent sets of $lead(I)$ is returned. """ function maximal_independent_set(I::sideal{S}; all::Bool = false) where S <: Union{spoly{T}, spoly{n_unknown{U}}} where {T <: Singular.FieldElem, U <: Nemo.FieldElem} I.isGB == false && error("I needs to be a Gröbner basis.") diff --git a/src/number/n_transExt.jl b/src/number/n_transExt.jl index 21cc48b40..3c5187f86 100644 --- a/src/number/n_transExt.jl +++ b/src/number/n_transExt.jl @@ -19,13 +19,13 @@ base_ring(a::N_FField) = a.base_ring @doc Markdown.doc""" transcendence_degree(F::N_FField) -> Return the trancendence degree of the given function field. +> Return the transcendence degree of the given function field. """ transcendence_degree(F::N_FField) = Int(libSingular.rPar(F.ptr)) @doc Markdown.doc""" basis(F::N_FField) -> Return the trancendence basis of the given function field. +> Return the transcendence basis of the given function field. """ function transcendence_basis(F::N_FField) n = transcendence_degree(F) @@ -105,7 +105,7 @@ end @doc Markdown.doc""" n_transExt_to_spoly(x::n_transExt; parent::PolyRing) > Returns the numerator of $x$ as a polynomial in a polynomial -> ring with the same number of variables, as the +> ring with at least as many variables, as the > transcendence degree of $parent(x)$. If a ring $parent_ring$ is > given to the function, it will be the parent ring of the output. """ @@ -116,7 +116,7 @@ function n_transExt_to_spoly(x::n_transExt; cached = true, n = transcendence_degree(R) S = parent_ring - if B != base_ring(S) || n != nvars(S) + if B != base_ring(S) || n > nvars(S) error("Base rings do not match.") end return S(Singular.libSingular.transExt_to_poly(x.ptr, R.ptr, S.ptr))