From b6526f93ed963e3d3730c8d29f4d13cad9a97ad3 Mon Sep 17 00:00:00 2001 From: kalmarek Date: Fri, 9 Oct 2020 17:16:33 +0200 Subject: [PATCH 1/3] update to Groups-0.5 and bump to 0.3.4 --- Project.toml | 8 ++++---- test/runtests.jl | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Project.toml b/Project.toml index f37d5b5..98f2a37 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "GroupRings" uuid = "0befed6a-bd73-11e8-1e41-a1190947c2f5" authors = ["Marek Kaluba "] -version = "0.3.3" +version = "0.3.4" [deps] AbstractAlgebra = "c3fe647b-3220-5bb0-a1ea-a7954cac585d" @@ -10,11 +10,11 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [compat] -AbstractAlgebra = "^0.9.0" +AbstractAlgebra = "^0.10.0" +Groups = "^0.5.0" [extras] -Groups = "5d8bd718-bd84-11e8-3b40-ad14f4a32557" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["Test", "Groups"] +test = ["Test"] diff --git a/test/runtests.jl b/test/runtests.jl index 5bc76ac..70b0b53 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -49,7 +49,7 @@ using SparseArrays S = gens(F) append!(S, [inv(s) for s in S]) - basis, sizes = Groups.generate_balls(S, one(F), radius=4) + basis, sizes = Groups.wlmetric_ball(S, one(F), radius=4) d = GroupRings.reverse_dict(basis) @test_throws KeyError create_pm(basis) pm = create_pm(basis, d, sizes[2]) @@ -120,7 +120,7 @@ using SparseArrays E(M, i,j) = (e_ij = one(M); e_ij[i,j] = 1; e_ij) S = [E(M, i,j) for i in 1:N for j in 1:N if i≠j] S = unique([S; inv.(S)]) - E_R, sizes = Groups.generate_balls(S, radius=2*halfradius) + E_R, sizes = Groups.wlmetric_ball(S, radius=2*halfradius) E_rdict = GroupRings.reverse_dict(E_R) pm = GroupRings.create_pm(E_R, E_rdict, sizes[halfradius]; twisted=true); @@ -260,7 +260,7 @@ using SparseArrays ID = one(G) RADIUS=3 - @time E_R, sizes = Groups.generate_balls(S, ID, radius=2*RADIUS); + @time E_R, sizes = Groups.wlmetric_ball(S, ID, radius=2*RADIUS); @test sizes == [9, 65, 457, 3201, 22409, 156865] E_rdict = GroupRings.reverse_dict(E_R) pm = GroupRings.create_pm(E_R, E_rdict, sizes[RADIUS]; twisted=true); From 6515bc373af7d9a7dcc612fae8cb299dfbb31dbd Mon Sep 17 00:00:00 2001 From: kalmarek Date: Wed, 14 Oct 2020 22:39:16 +0200 Subject: [PATCH 2/3] add ci+tagbot through gh actions --- .github/workflows/TagBot.yml | 11 +++++++++ .github/workflows/runtests.yml | 42 ++++++++++++++++++++++++++++++++++ .travis.yml | 9 ++------ LICENSE.md | 39 +++++++++++++++---------------- Project.toml | 1 + 5 files changed, 74 insertions(+), 28 deletions(-) create mode 100644 .github/workflows/TagBot.yml create mode 100644 .github/workflows/runtests.yml diff --git a/.github/workflows/TagBot.yml b/.github/workflows/TagBot.yml new file mode 100644 index 0000000..d77d3a0 --- /dev/null +++ b/.github/workflows/TagBot.yml @@ -0,0 +1,11 @@ +name: TagBot +on: + schedule: + - cron: 0 * * * * +jobs: + TagBot: + runs-on: ubuntu-latest + steps: + - uses: JuliaRegistries/TagBot@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/runtests.yml b/.github/workflows/runtests.yml new file mode 100644 index 0000000..e4c950e --- /dev/null +++ b/.github/workflows/runtests.yml @@ -0,0 +1,42 @@ +name: CI +on: + push: + branches: + - master + pull_request: + branches: + - master +jobs: + test: + name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + version: + - '1.3' + - '1.5' + - 'nightly' + os: + - ubuntu-latest + - macOS-latest + - windows-latest + arch: + - x64 + fail-fast: false + + steps: + - uses: actions/checkout@v2 + - uses: julia-actions/setup-julia@v1 + with: + version: ${{ matrix.version }} + arch: ${{ matrix.arch }} + - uses: julia-actions/julia-buildpkg@latest + - uses: julia-actions/julia-runtest@latest + - uses: julia-actions/julia-processcoverage@v1 + - uses: codecov/codecov-action@v1 + with: + file: ./lcov.info + flags: unittests + name: codecov-umbrella + fail_ci_if_error: false + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.travis.yml b/.travis.yml index d35e751..8625911 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,19 +4,14 @@ os: - linux - osx julia: - - 1.0 - - 1.4 + - 1.3 - 1.5 - nightly notifications: - email: true + email: false matrix: fast_finish: true allow_failures: - julia: nightly -script: - - julia -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/kalmarek/Groups.jl")); Pkg.build(); Pkg.test(coverage=true);' - - julia --color=yes -e "if VERSION < v\"0.7.0-DEV.5183\"; cd(Pkg.dir(\"${JL_PKG}\")); else using Pkg; end; Pkg.add(\"Coverage\"); using Coverage; Codecov.submit(process_folder())" - codecov: true diff --git a/LICENSE.md b/LICENSE.md index c51c629..0532074 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,22 +1,19 @@ -The GroupRings.jl package is licensed under the MIT "Expat" License: +Copyright (c) 2020: Marek Kaluba. -> Copyright (c) 2017: kalmar. -> -> Permission is hereby granted, free of charge, to any person obtaining a copy -> of this software and associated documentation files (the "Software"), to deal -> in the Software without restriction, including without limitation the rights -> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -> copies of the Software, and to permit persons to whom the Software is -> furnished to do so, subject to the following conditions: -> -> The above copyright notice and this permission notice shall be included in all -> copies or substantial portions of the Software. -> -> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -> SOFTWARE. -> +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/Project.toml b/Project.toml index 98f2a37..5abeb18 100644 --- a/Project.toml +++ b/Project.toml @@ -12,6 +12,7 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [compat] AbstractAlgebra = "^0.10.0" Groups = "^0.5.0" +julia = "1.3, 1.4, 1.5" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" From 3ee94ce53baa05c5592bd6aeed6f2c4381267698 Mon Sep 17 00:00:00 2001 From: kalmarek Date: Wed, 14 Oct 2020 22:59:44 +0200 Subject: [PATCH 3/3] =?UTF-8?q?move=20LICENCE.md=20=E2=86=92=20LICENCE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 7 +++++++ LICENSE.md | 19 ------------------- 2 files changed, 7 insertions(+), 19 deletions(-) create mode 100644 LICENSE delete mode 100644 LICENSE.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..36308ed --- /dev/null +++ b/LICENSE @@ -0,0 +1,7 @@ +Copyright 2020 Marek Kaluba + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 0532074..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2020: Marek Kaluba. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE.