From 31a5805a814c2b8b9e739b59a20c4b15d3c63d8d Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Fri, 24 May 2024 09:36:04 +0100 Subject: [PATCH 1/8] ci: install libtool for macosx (#1012) * ci: install libtool for macosx * ci: add gap stable-4.13 to ci.yml * ci: exclude macos / GAP 4.12 --- .github/workflows/ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f830c8dd8..f1043f52c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,14 +26,21 @@ jobs: gap-branch: - master - stable-4.12 + - stable-4.13 ABI: - 64 + exclude: + # We exclude this combination for the reasons discussed at: + # https://github.com/semigroups/Semigroups/pull/1015 + # https://github.com/gap-system/gap/issues/5640 + - os: macos + gap-branch: stable-4.12 steps: - uses: actions/checkout@v4 - name: "Install dependencies (macOS only!)" if: ${{ runner.os == 'macOS' }} - run: brew install automake + run: brew install automake libtool # Setup ccache, to speed up repeated compilation of the same binaries # (i.e., GAP and the packages) - name: "Setup ccache" From e8f3c7e956bf0aec8f56684289ef267258a287fb Mon Sep 17 00:00:00 2001 From: Chris Jefferson Date: Thu, 23 May 2024 11:29:10 +0800 Subject: [PATCH 2/8] Fix my website --- CHANGELOG.md | 2 +- PackageInfo.g | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b06708d93..07763b937 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1617,7 +1617,7 @@ added the functions `CitrusDefaultMem`, `CitrusHiMem`, [Michael Young]: https://mct25.host.cs.st-andrews.ac.uk [Nick Ham]: https://n-ham.github.io [Wilf A. Wilson]: https://wilf.me -[Chris Jefferson]: https://caj.host.cs.st-andrews.ac.uk/ +[Chris Jefferson]: https://heather.cafe [Finn Smith]: https://flsmith.github.io [Luke Elliott]: https://le27.github.io/Luke-Elliott/ [GAP]: https://www.gap-system.org diff --git a/PackageInfo.g b/PackageInfo.g index 26effbfe5..811c48dd5 100644 --- a/PackageInfo.g +++ b/PackageInfo.g @@ -192,7 +192,7 @@ Persons := [ IsAuthor := true, IsMaintainer := false, Email := "caj21@st-andrews.ac.uk", - WWWHome := "https://caj.host.cs.st-andrews.ac.uk/", + WWWHome := "https://heather.cafe/", PostalAddress := _STANDREWSCS, Place := "St Andrews", Institution := "University of St Andrews"), From a6bb1150bc9aa37c46ceb01e04c90507f5580722 Mon Sep 17 00:00:00 2001 From: Chris Jefferson Date: Thu, 23 May 2024 11:28:00 +0800 Subject: [PATCH 3/8] Add packages to avoid GAP having to build things itself --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1043f52c..f53b931af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: - uses: actions/checkout@v4 - name: "Install dependencies (macOS only!)" if: ${{ runner.os == 'macOS' }} - run: brew install automake libtool + run: brew install automake autoconf zlib gmp pkg-config libtool # Setup ccache, to speed up repeated compilation of the same binaries # (i.e., GAP and the packages) - name: "Setup ccache" From 0f11e6964d1102cd0c7f492f03fca50d34b8338c Mon Sep 17 00:00:00 2001 From: "James D. Mitchell" Date: Fri, 24 May 2024 09:45:07 +0100 Subject: [PATCH 4/8] Fix spelling for new codespell version --- .codespellrc | 2 +- gap/fp/freeband.gi | 6 +++--- gap/fp/freeinverse.gd | 2 +- gap/fp/freeinverse.gi | 2 +- gap/semigroups/grpperm.gd | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.codespellrc b/.codespellrc index 551d67c11..c2c375755 100644 --- a/.codespellrc +++ b/.codespellrc @@ -1,3 +1,3 @@ [codespell] skip = ./.git,./tmp,./gapbind14,./libsemigroups,./tst,./bin,./libtool,configure,configure~,config.guess,./gh-pages,./autom4te.cache,./cnf,aclocal.m4,./m4,./doc/*.log,./doc/*.html,./doc/*.txt,./doc/*.six,./doc/*.js,./doc/*.bbl,./doc/*.tex,./doc/*.bib -ignore-words-list=yse,alph,Alph,lits,bu,ser,wit,documen,ines,manuel +ignore-words-list=yse,alph,Alph,lits,bu,ser,wit,documen,ines,manuel,combin diff --git a/gap/fp/freeband.gi b/gap/fp/freeband.gi index b47de2793..16fdb5653 100644 --- a/gap/fp/freeband.gi +++ b/gap/fp/freeband.gi @@ -3,7 +3,7 @@ ## fp/freeband.gi ## Copyright (C) 2013-2022 Julius Jonusas ## -## Licensing information can be foundin the README file of this package. +## Licensing information can be found in the README file of this package. ## ############################################################################### @@ -52,7 +52,7 @@ SEMIGROUPS.FreeBandElmToWord := function(elem) first := tuple![1]; pre_tuple := tuple![2]; # tuple corresponding to the prefix last := tuple![3]; - su_tuple := tuple![4]; # tuple corresponding to the sufix + su_tuple := tuple![4]; # tuple corresponding to the suffix # if first = last we only need a single letter if first = last then @@ -418,7 +418,7 @@ function(x, y) type := TypeObj(x); # if the content of two elements is the same we only need the prefix of the - # first and the sufix of the second one + # first and the suffix of the second one # cont = blist if IsSubsetBlist(x!.cont, y!.cont) then out := [x!.tuple[1], x!.tuple[2]]; diff --git a/gap/fp/freeinverse.gd b/gap/fp/freeinverse.gd index e2a6f7d69..80728549a 100644 --- a/gap/fp/freeinverse.gd +++ b/gap/fp/freeinverse.gd @@ -3,7 +3,7 @@ ## fp/freeinverse.gd ## Copyright (C) 2013-2022 Julius Jonusas ## -## Licensing information can be foundin the README file of this package. +## Licensing information can be found in the README file of this package. ## ############################################################################### diff --git a/gap/fp/freeinverse.gi b/gap/fp/freeinverse.gi index 7872d45e1..4d367d5d6 100644 --- a/gap/fp/freeinverse.gi +++ b/gap/fp/freeinverse.gi @@ -3,7 +3,7 @@ ## fp/freeinverse.gi ## Copyright (C) 2013-2022 Julius Jonusas ## -## Licensing information can be foundin the README file of this package. +## Licensing information can be found in the README file of this package. ## ############################################################################### ## diff --git a/gap/semigroups/grpperm.gd b/gap/semigroups/grpperm.gd index b633db4a8..91ffa971c 100644 --- a/gap/semigroups/grpperm.gd +++ b/gap/semigroups/grpperm.gd @@ -3,7 +3,7 @@ ## semigroups/grpperm.gd ## Copyright (C) 2014-2022 James D. Mitchell ## -## Licensing information can be foundin the README file of this package. +## Licensing information can be found in the README file of this package. ## ############################################################################# ## From 133d7f7b53068a8a02d8d6b13cc99668b6e15600 Mon Sep 17 00:00:00 2001 From: "James D. Mitchell" Date: Sat, 3 Jun 2023 11:47:53 +0100 Subject: [PATCH 5/8] cong: fix typo in ImagesElm --- gap/libsemigroups/cong.gi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gap/libsemigroups/cong.gi b/gap/libsemigroups/cong.gi index 4f0f4e478..68c338e66 100644 --- a/gap/libsemigroups/cong.gi +++ b/gap/libsemigroups/cong.gi @@ -417,7 +417,7 @@ function(cong, elm) elif IsFpSemigroup(Range(cong)) or (HasIsFreeSemigroup(Range(cong)) and IsFreeSemigroup(Range(cong))) or IsFpMonoid(Range(cong)) - or (HasIsFreeSemigroup(Range(cong)) and IsFreeMonoid(Range(cong))) + or (HasIsFreeMonoid(Range(cong)) and IsFreeMonoid(Range(cong))) or IsQuotientSemigroup(Range(cong)) then part := EquivalenceRelationPartition(cong); pos := PositionProperty(part, l -> [elm, l[1]] in cong); From 7c6fa1fa60e835ab26ebd000aa889da74aaa1824 Mon Sep 17 00:00:00 2001 From: "James D. Mitchell" Date: Mon, 29 Jul 2024 11:25:09 +0100 Subject: [PATCH 6/8] Don't try to read non-existent file This should resolve #1022 --- read.g | 1 - 1 file changed, 1 deletion(-) diff --git a/read.g b/read.g index f89150a42..d189d3f46 100644 --- a/read.g +++ b/read.g @@ -11,7 +11,6 @@ ReadPackage("semigroups", "gap/tools/display.gi"); ReadPackage("semigroups", "gap/tools/io.gi"); ReadPackage("semigroups", "gap/tools/utils.gi"); -ReadPackage("semigroups", "gap/tools/enums.gi"); ReadPackage("semigroups", "gap/tools/iterators.gi"); ReadPackage("semigroups", "gap/elements/star.gi"); From 246b5cdb993dd14fcefbda0560040b3a5bc5669c Mon Sep 17 00:00:00 2001 From: "James D. Mitchell" Date: Tue, 27 Aug 2024 16:39:17 +0100 Subject: [PATCH 7/8] ci: update release.yml to brew install libtool --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ce5cf794..e308c9843 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v4 - name: "Install dependencies (macOS only!)" if: ${{ runner.os == 'macOS' }} - run: brew install automake + run: brew install automake libtool # Setup ccache, to speed up repeated compilation of the same binaries # (i.e., GAP and the packages) - name: "Setup ccache" From 677b71e432eee24b4bcb13fd5717c6544edb1369 Mon Sep 17 00:00:00 2001 From: "James D. Mitchell" Date: Tue, 27 Aug 2024 14:09:39 +0100 Subject: [PATCH 8/8] Update version numbers etc for v5.3.8 --- .VERSION | 2 +- .mailmap | 3 +++ CHANGELOG.md | 6 ++++++ PackageInfo.g | 24 ++++++++++++++++++++++-- VERSIONS | 1 + 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/.VERSION b/.VERSION index 025c1ae7c..8a30e8f94 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -5.3.7 +5.4.0 diff --git a/.mailmap b/.mailmap index cac24492c..031d20872 100644 --- a/.mailmap +++ b/.mailmap @@ -8,6 +8,7 @@ Joseph Edwards Joe Edwards <80713360+Joseph-Edwards@user Joseph Edwards Joseph Edwards Luke Elliott le27 Fernando Flores Brito Fernando Flores Brito +Tillman Froehlich Tillman <47321884+awesometillman@users.noreply.github.com> Nick Ham Robert Hancock Robert Hancock Max Horn Max Horn @@ -19,6 +20,7 @@ Olexandr Konovalov Alexander Konovalov Alexander Konovalov Olexandr Konovalov Olexandr Konovalov <5751387+olexandr-konovalov@users.noreply.github.com> Artemis Konstantinidi artemiskonst <97620468+artemiskonst@users.noreply.github.com> +Hyeokjun Kwon Hyeokjun Kwon James Mitchell James Mitchell James Mitchell @@ -39,6 +41,7 @@ Chris Wensley cdwensley Murray Whyte <42549861+MTWhyte@users.noreply.github.com> Wilf Wilson Wilf Wilson Wilf Wilson wilfwilson +Tianrun Yang Tianrun Yang <117233646+Tianrun-Y@users.noreply.github.com> Michael Young Michael Young Michael Young mct25 diff --git a/CHANGELOG.md b/CHANGELOG.md index 07763b937..fcf1d57c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ Copyright © 2011-2024 [James D. Mitchell][] et al. Licensing information can be found in the `LICENSE` file. +## Version 5.4.0 (released 27/08/2024) + +This is a fairly minor release that includes a single new feature (constructors +for free semilattices), and a number of minor bug fixes, and other +improvements. + ## Version 5.3.7 (released 11/03/2024) This is a minor release with some changes for compatibility with GAP. diff --git a/PackageInfo.g b/PackageInfo.g index 1365f7bc5..71f4a0d6b 100644 --- a/PackageInfo.g +++ b/PackageInfo.g @@ -34,8 +34,8 @@ _STANDREWSCS := Concatenation(["Jack Cole Building, North Haugh, ", SetPackageInfo(rec( PackageName := "Semigroups", Subtitle := "A package for semigroups and monoids", -Version := "5.3.7", -Date := "11/03/2024", # dd/mm/yyyy format +Version := "5.4.0", +Date := "27/08/2024", # dd/mm/yyyy format License := "GPL-3.0-or-later", ArchiveFormats := ".tar.gz", @@ -152,6 +152,13 @@ Persons := [ Email := "ffloresbrito@gmail.com", WWWHome := "https://github.com/ffloresbrito"), + rec( + LastName := "Froehlich", + FirstNames := "Tillman", + IsAuthor := true, + IsMaintainer := false, + Email := "trf1@st-andrews.ac.uk"), + rec( LastName := "Ham", FirstNames := "Nick", @@ -206,6 +213,12 @@ Persons := [ WWWHome := "http://julius.jonusas.work", Place := "Brussels, Belgium"), + rec(LastName := "Kwon", + FirstNames := "Hyeokjun", + IsAuthor := false, + IsMaintainer := false, + Email := "hk78@st-andrews.ac.uk"), + rec( LastName := "Nagpal", FirstNames := "Chinmaya", @@ -344,6 +357,13 @@ Persons := [ Email := "gap@wilf-wilson.net", WWWHome := "https://wilf.me"), + rec( + LastName := "Yang", + FirstNames := "Tianrun", + IsAuthor := true, + IsMaintainer := false, + Email := "ty39@st-andrews.ac.uk"), + rec( LastName := "Young", FirstNames := "Michael", diff --git a/VERSIONS b/VERSIONS index f45f3c7f5..46edfe267 100644 --- a/VERSIONS +++ b/VERSIONS @@ -9,6 +9,7 @@ ## ## +release 5.4.0 - 27/08/2024 release 5.3.7 - 11/03/2024 release 5.3.6 - 19/02/2024 release 5.3.5 - 14/02/2024