Merge branch 'stable-5.3'

semigroups · May 29, 2024 · 1e9d1d2 · 1e9d1d2
2 parents fa9344f + 0f11e69
commit 1e9d1d2
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 10 deletions.
diff --git 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/.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 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"

diff --git 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
@@ -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"),

diff --git 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
@@ -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
@@ -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
@@ -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.
 ##
 #############################################################################
 ##