Update test output for compatibility with pluralisation changes in GAP

.github/workflows/os.yml

@@ -10,9 +10,6 @@ on:
     # Every day at 3:30 AM UTC
     - cron: 30 3 * * *
 
-env:
-  DIGRAPHS_LIB: digraphs-lib-0.7
-
 concurrency:
   # Group by workflow and ref; the last component ensures that for pull requests
   # we limit to one concurrent job, but for the main/stable branches we don't
@@ -91,9 +88,7 @@ jobs:
         with:
           ABI: ${{ matrix.ABI }}
       - name: Install digraphs-lib . . .
-        run: |
-          curl --retry 5 -L -O "https://digraphs.github.io/Digraphs/${{ env.DIGRAPHS_LIB }}.tar.gz"
-          tar xf "${{ env.DIGRAPHS_LIB }}.tar.gz"
+        run: git clone https://github.com/digraphs/digraphs-lib.git
       - name: Run DigraphsTestInstall . . .
         uses: gap-actions/run-pkg-tests@v4
         with:

.github/workflows/ubuntu.yml

@@ -10,9 +10,6 @@ on:
     # Every day at 3:30 AM UTC
     - cron: 30 3 * * *
 
-env:
-  DIGRAPHS_LIB: digraphs-lib-0.7
-
 concurrency:
   # Group by workflow and ref; the last component ensures that for pull requests
   # we limit to one concurrent job, but for the main/stable branches we don't
@@ -33,19 +30,24 @@ jobs:
           - v4.14
           - v4.13
           - v4.12
-          - v4.11
         mode:
           - onlyneeded
           - default
         include:
           - mode: onlyneeded
             pkgs-to-clone: https://github.com/digraphs/graphviz.git
-            # Remove asterisks * when we no longer support GAP 4.11
-            pkgs-to-build: io* orb* datastructures* profiling*
+            pkgs-to-build: io orb datastructures profiling
           - mode: default
             pkgs-to-clone: https://github.com/digraphs/graphviz.git https://github.com/gap-packages/NautyTracesInterface.git
-            # Remove asterisks * when we no longer support GAP 4.11
-            pkgs-to-build: io* orb* datastructures* profiling* grape* NautyTracesInterface
+            pkgs-to-build: io orb datastructures profiling grape NautyTracesInterface
+
+          - gap-version: v4.11  # Note: NautyTracesInterface requires GAP 4.12
+            mode: default  # There wouldn't be much point testing GAP v4.11 with only needed packages. The only difference is whether Grape is loaded.
+            pkgs-to-clone: https://github.com/digraphs/graphviz.git
+            pkgs-to-build: io* orb* datastructures* profiling* grape*
+          - gap-version: v4.10  # Note: NautyTracesInterface requires GAP 4.12
+            mode: default  # There wouldn't be much point testing GAP v4.10 with only needed packages. The only difference is whether Grape is loaded.
+            pkgs-to-build: io* orb* datastructures profiling* grape*
 
     steps:
       - uses: actions/checkout@v5
@@ -56,21 +58,27 @@ jobs:
         with:
           gap-version: ${{ matrix.gap-version }}
       - name: "Install necessary GAP package clones . . ."
+        if: ${{ matrix.gap-version != 'v4.10' }}
         run: |
           for PKG in ${{ matrix.pkgs-to-clone }}; do
             cd ${GAPROOT}/pkg
             git clone $PKG
           done
+      # Add a special case for GAP v4.10 because it requires checking out a
+      # specific version of the repository (not the default branch).
+      - name: "Install datastructures v0.2.5 for GAP 4.10"
+        if: ${{ matrix.gap-version == 'v4.10' }}
+        run: |
+            cd ${GAPROOT}/pkg
+            git clone -b v0.2.5 https://github.com/gap-packages/datastructures datastructures
       - name: "Build additional necessary GAP packages . . ."
         run: |
           cd ${GAPROOT}/pkg
           ../bin/BuildPackages.sh --strict ${{ matrix.pkgs-to-build }}
       - name: Build Digraphs . . .
         uses: gap-actions/build-pkg@v2
       - name: Install digraphs-lib . . .
-        run: |
-          curl --retry 5 -L -O "https://digraphs.github.io/Digraphs/${{ env.DIGRAPHS_LIB }}.tar.gz"
-          tar xf "${{ env.DIGRAPHS_LIB }}.tar.gz"
+        run: git clone https://github.com/digraphs/digraphs-lib.git
       - name: Run DigraphsTestInstall . . .
         uses: gap-actions/run-pkg-tests@v4
         with:

Makefile.in

@@ -45,30 +45,34 @@ endif
 
 
 ifdef WITH_INCLUDED_PLANARITY
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphDFSUtils.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphDrawPlanar.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphDrawPlanar_Extensions.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphEmbed.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphExtensions.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphIO.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphIsolator.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphK23Search.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphK23Search_Extensions.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphK33Search.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphK33Search_Extensions.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphK4Search.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphK4Search_Extensions.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphNonplanar.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphOuterplanarObstruction.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphTests.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphUtils.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/listcoll.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/planarityRandomGraphs.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/planaritySpecificGraph.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/planarityUtils.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/stack.c
-
-  KEXT_CFLAGS += -I$(PLANARITY_SUITE_DIR)
+  KEXT_SOURCES += \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/graphDFSUtils.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/graphUtils.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/extensionSystem/graphExtensions.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/homeomorphSearch/graphK23Search.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/homeomorphSearch/graphK23Search_Extensions.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/homeomorphSearch/graphK33Search.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/homeomorphSearch/graphK33Search_Extensions.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/homeomorphSearch/graphK4Search.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/homeomorphSearch/graphK4Search_Extensions.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/io/g6-api-utilities.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/io/g6-read-iterator.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/io/g6-write-iterator.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/io/graphIO.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/io/strbuf.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/io/strOrFile.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/lowLevelUtils/apiutils.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/lowLevelUtils/listcoll.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/lowLevelUtils/stack.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphDrawPlanar.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphDrawPlanar_Extensions.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphEmbed.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphIsolator.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphNonplanar.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphOuterplanarObstruction.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphTests.c
+
+  KEXT_CFLAGS += -I$(PLANARITY_SUITE_DIR) -include extern/eaps_flags.h
 else
   KEXT_LDFLAGS += -lplanarity
 endif

configure.ac

@@ -94,7 +94,7 @@ AS_IF([test "x$enable_compile_warnings" != "xno"],
 
 AX_CHECK_PLANARITY
 if test "x$with_external_planarity" = xno ; then
-  PLANARITY_SUITE_DIR=extern/edge-addition-planarity-suite-Version_3.0.1.0
+  PLANARITY_SUITE_DIR=extern/edge-addition-planarity-suite-Version_4.0.0.0
   AC_SUBST(PLANARITY_SUITE_DIR)
 fi
 

doc/prop.xml

@@ -1589,31 +1589,31 @@ false]]></Example>
 </ManSection>
 <#/GAPDoc>
 
-<#GAPDoc Label="IsTwoEdgeTransitive">
+<#GAPDoc Label="Is2EdgeTransitive">
 <ManSection>
-  <Prop Name="IsTwoEdgeTransitive" Arg="digraph"/>
+  <Prop Name="Is2EdgeTransitive" Arg="digraph"/>
   <Returns><K>true</K> or <K>false</K>.</Returns>
   <Description>
-    If <A>digraph</A> is a digraph without multiple edges, then <C>IsTwoEdgeTransitive</C>
+    If <A>digraph</A> is a digraph without multiple edges, then <C>Is2EdgeTransitive</C>
     returns <K>true</K> if <A>digraph</A> is 2-edge transitive, and <K>false</K>
-    otherwise. A digraph is <E>2-edge transitive</E> if its automorphism group
-    acts transitively on its 2-edges via the action
-    <Ref Func="OnTuplesTuples" BookName="ref"/>.
+    otherwise. If <A>digraph</A> has multiple edges, then <C>Is2EdgeTransitive</C> returns an error.
 
-    A <E>2-edge</E> of a digraph is a pair of its edges, such that the range of the
-    first edge is equal to the source of the second edge.
+    A digraph is <E>2-edge transitive</E> if its automorphism group
+    acts transitively on 2-edges via the action
+    <Ref Func="OnTuples" BookName="ref"/>. A <E>2-edge</E> in a digraph is a triple (u, v, w) of distinct vertices
+    such that (u, v) and (v, w) are edges.
     <P/>
 
     &MUTABLE_RECOMPUTED_PROP;
 
     <Example><![CDATA[
-gap> IsTwoEdgeTransitive(CompleteDigraph(4));
+gap> Is2EdgeTransitive(CompleteDigraph(4));
 true
-gap> IsTwoEdgeTransitive(DigraphByEdges([[1, 2], [2, 3], [3, 1], [3, 4]]))
+gap> Is2EdgeTransitive(DigraphByEdges([[1, 2], [2, 3], [3, 4]]));
 false
-gap> IsTwoEdgeTransitive(CycleDigraph(5));
+gap> Is2EdgeTransitive(CycleDigraph(5));
 true
-gap> IsTwoEdgeTransitive(Digraph([[2], [3, 3, 3], []]));
+gap> Is2EdgeTransitive(Digraph([[2], [3, 3, 3], []]));
 Error, the argument <D> must be a digraph with no multiple edges,
 ]]></Example>
   </Description>

doc/z-chap5.xml

@@ -78,6 +78,7 @@
     <#Include Label="IsDigraphCore">
     <#Include Label="IsEdgeTransitive">
     <#Include Label="IsVertexTransitive">
+    <#Include Label="Is2EdgeTransitive">
   </Section>
 
 

extern/eaps_flags.h

@@ -0,0 +1,20 @@
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wdeprecated-non-prototype"
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
+#pragma clang diagnostic ignored "-Wstrict-prototypes"
+#endif
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wold-style-definition"
+#pragma GCC diagnostic ignored "-Wshadow"
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#pragma GCC diagnostic ignored "-Wunused-result"
+#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+#pragma GCC diagnostic ignored "-Wnull-dereference"
+#endif