Skip to content

Commit 1d910df

Browse files
committed
Remove support for GAP 4.10
1 parent bca3537 commit 1d910df

File tree

10 files changed

+12
-62
lines changed

10 files changed

+12
-62
lines changed

.github/workflows/ubuntu.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ jobs:
4545
mode: default # There wouldn't be much point testing GAP v4.11 with only needed packages. The only difference is whether Grape is loaded.
4646
pkgs-to-clone: https://github.com/digraphs/graphviz.git
4747
pkgs-to-build: io* orb* datastructures* profiling* grape*
48-
- gap-version: v4.10 # Note: NautyTracesInterface requires GAP 4.12
49-
mode: default # There wouldn't be much point testing GAP v4.10 with only needed packages. The only difference is whether Grape is loaded.
50-
pkgs-to-build: io* orb* datastructures profiling* grape*
5148

5249
steps:
5350
- uses: actions/checkout@v5
@@ -60,16 +57,11 @@ jobs:
6057
- name: "Build Digraphs . . ."
6158
uses: gap-actions/build-pkg@v2
6259
- name: "Clone additional GAP packages . . ."
63-
if: ${{ matrix.gap-version != 'v4.10' }}
6460
run: |
6561
for PKG in ${{ matrix.pkgs-to-clone }}; do
6662
cd ${GAPROOT}/pkg
6763
git clone $PKG
6864
done
69-
# Special case for GAP v4.10 as it requires checking out a non-default ref
70-
- name: "Clone datastructures v0.2.5 (GAP 4.10 only) . . ."
71-
if: ${{ matrix.gap-version == 'v4.10' }}
72-
run: git clone -b v0.2.5 https://github.com/gap-packages/datastructures ${GAPROOT}/pkg/datastructures
7365
- name: "Build relevant GAP packages . . ."
7466
run: |
7567
cd ${GAPROOT}/pkg

Makefile.gappkg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ KEXT_BINARCHDIR = bin/$(GAParch)
5151
KEXT_SO = $(KEXT_BINARCHDIR)/$(KEXT_NAME).so
5252

5353
# the following settings are provided by sysinfo.gap in GAP >= 4.12;
54-
# for compatibility with older GAP version (at least 4.9, 4.10, 4.11)
54+
# for compatibility with GAP 4.11
5555
# we try to "guess" suitable values here
5656
GAP ?= $(GAPPATH)/gap
5757
GAC ?= $(GAPPATH)/gac

PackageInfo.g

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ PackageDoc := rec(
539539
),
540540

541541
Dependencies := rec(
542-
GAP := ">=4.10.0",
542+
GAP := ">=4.11.0",
543543
NeededOtherPackages := [["IO", ">=4.5.1"],
544544
["orb", ">=4.8.2"],
545545
["datastructures", ">=0.2.5"]],

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ For questions, remarks, suggestions, and issues please use the
2727
## Installation
2828

2929
It is assumed that you have a working copy of [GAP][] with version number
30-
4.10.0 or higher. The most up-to-date version of GAP, and instructions on how
30+
4.11.0 or higher. The most up-to-date version of GAP, and instructions on how
3131
to install it, can be obtained from the
3232
[main GAP webpage](https://www.gap-system.org).
3333

init.g

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,6 @@ fi;
4545
if not IsBound(Adjacency) then
4646
Adjacency := IdFunc;
4747
fi;
48-
# Avoid warnings with GAP 4.10 for use of FlipBlist
49-
# Can be removed once Digraphs requires GAP>=4.11
50-
if not IsBound(FlipBlist) then
51-
FlipBlist := function(BList)
52-
Apply(BList, x -> not x);
53-
end;
54-
fi;
5548

5649
ReadPackage("digraphs", "gap/digraph.gd");
5750
ReadPackage("digraphs", "gap/digraphs.g");

m4/find_gap.m4

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ AC_DEFUN([FIND_GAP],
8383
AC_MSG_ERROR([No GAP_CPPFLAGS is given])
8484
fi
8585
86-
# compatibility with GAP 4.9 (not needed in GAP >= 4.10)
87-
GAP_CPPFLAGS="$GAP_CPPFLAGS -I${GAP_LIB_DIR}/src"
88-
8986
AC_SUBST(GAPARCH)
9087
AC_SUBST(GAPROOT)
9188
AC_SUBST(GAP_CPPFLAGS)

read.g

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@ BindGlobal("DIGRAPHS_NautyAvailable",
3030

3131
Unbind(_NautyTracesInterfaceVersion);
3232

33-
# Delete this when we no longer support GAP 4.10
34-
if not CompareVersionNumbers(ReplacedString(GAPInfo.Version, "dev", ""), "4.11")
35-
and not IsBound(INTOBJ_MAX) then
36-
BindGlobal("INTOBJ_MAX", 1152921504606846975);
37-
fi;
38-
3933
ReadPackage("digraphs", "gap/utils.gi");
4034
ReadPackage("digraphs", "gap/digraph.gi");
4135
ReadPackage("digraphs", "gap/constructors.gi");

src/gap-includes.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,4 @@
2727
// GAP headers
2828
#include "gap_all.h" // for Obj, Int
2929
//
30-
#ifdef GAP410_OR_OLDER
31-
#include "compiled.h" // FIXME Remove include when we don't support GAP 4.10
32-
#endif
33-
34-
#endif // DIGRAPHS_SRC_GAP_INCLUDES_H_
30+
#endif // DIGRAPHS_SRC_GAP_INCLUDES_H_

src/gap_all.h

Lines changed: 0 additions & 20 deletions
This file was deleted.

tst/standard/grahom.tst

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,14 @@ Error, the 7th argument <injective> must 0, 1, or 2, not -1,
5252
gap> HomomorphismDigraphsFinder(gr1, gr2, fail, "a", infinity, 2, 1, 0, 0,
5353
> 0, 0);
5454
Error, the 8th argument <image> must be a list or fail, not integer,
55-
56-
# Commented out due to difference in the rmessage for GAP 4.10 vs GAP 4.11
57-
#gap> HomomorphismDigraphsFinder(gr1, gr2, fail, [], 1, 1, 1, [1, []], 0,
58-
#> 0, 0);
59-
#Error, the 8th argument <image> must only contain positive integers, but found\
60-
# list (plain,empty) in position 2,
61-
#gap> HomomorphismDigraphsFinder(gr1, gr2, fail, [], 1, 1, 1, [[], []], 0,
62-
#> 0, 0);
63-
#Error, the 8th argument <image> must only contain positive integers, but found\
64-
# list (plain,empty) in position 1,
55+
gap> HomomorphismDigraphsFinder(gr1, gr2, fail, [], 1, 1, 1, [1, []], 0,
56+
> 0, 0);
57+
Error, the 8th argument <image> must only contain positive integers, but found\
58+
empty plain list in position 2,
59+
gap> HomomorphismDigraphsFinder(gr1, gr2, fail, [], 1, 1, 1, [[], []], 0,
60+
> 0, 0);
61+
Error, the 8th argument <image> must only contain positive integers, but found\
62+
empty plain list in position 1,
6563
gap> HomomorphismDigraphsFinder(gr1, gr2, fail, [], 1, 1, 1, [0, 1], 0, 0,
6664
> 0);
6765
Error, the 8th argument <image> must only contain positive integers, but found\

0 commit comments

Comments
 (0)