Skip to content

Commit

Permalink
Update version numbers etc for v3.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
james-d-mitchell committed Feb 7, 2021
1 parent 225b0a3 commit 7fcd59b
Show file tree
Hide file tree
Showing 8 changed files with 132 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.1
3.4.2
116 changes: 116 additions & 0 deletions .release
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
#!/bin/bash
# This script is intended to be run by the release-gap-package script which is
# part of the the ReleaseTools for GAP:
#
# https://github.com/gap-system/ReleaseTools/

set -e

# ensure we are in the same directory as this script
cd "$(dirname "${BASH_SOURCE[0]}")"

notice_it() {
printf '\033[93m%s\033[0m\n' "$*"
}

error() {
printf '\033[31mERROR: %s\033[0m\n' "$*"
exit 1
}

run_gap() {
gap_output=$( \
(echo 'OnBreak:=function() Print("FATAL ERROR"); FORCE_QUIT_GAP(1); end;;' ; cat - ; echo ; echo "FORCE_QUIT_GAP(0);") \
| $GAP -A -q -b 2>&1 \
| tr -d '\r' )
mkdir -p "$TMP_DIR"
echo "$gap_output" > "$TMP_DIR/gap-error.log"
if echo "$gap_output" | grep -q '\(Error\|FATAL ERROR\|Syntax \)' ; then
error "there was an error running GAP, see $TMP_DIR/gap-error.log"
fi
}

notice_it "Running Semigroup package .release script"

# Delete unnecessary files

notice_it "Deleting additional unnecessary files"

rm -f .covignore
rm -f .codecov.yml
rm -f .gaplint.yml
rm -f azure-pipelines.yml

rm -rf ci
rm -rf etc


# download libsemigroups
SEMI_DIR="$PWD"
LIBS_DIR="$SEMI_DIR/libsemigroups"

# Get libsemigroups version from file
if [ -f "$SEMI_DIR/.LIBSEMIGROUPS_VERSION" ]; then
VERS=`tr -d '\n' < $SEMI_DIR/.LIBSEMIGROUPS_VERSION`
else
notice_it "Error, cannot find $SEMI_DIR/.LIBSEMIGROUPS_VERSION"
exit 1
fi

notice_it "libsemigroups v$VERS is required by this version of Semigroups"

if [ -d "$LIBS_DIR" ] && [ "$(ls -A $LIBS_DIR)" ]; then
notice_it "the libsemigroups directory exists and is non-empty"
exit 1
fi

# Download libsemigroups
notice_it "Downloading libsemigroups v$VERS into $LIBS_DIR..."
curl -L -O "https://github.com/libsemigroups/libsemigroups/releases/download/v$VERS/libsemigroups-$VERS.tar.gz"
tar -xzf "libsemigroups-$VERS.tar.gz" && rm -f "libsemigroups-$VERS.tar.gz" && mv "libsemigroups-$VERS" "$LIBS_DIR"

# Build the package because it must be loadable for the doc to be compiled (for
# some reason)

notice_it "Building the Semigroups package"

./autogen.sh
./configure --with-gaproot=/Users/jdm/gap CXX="ccache g++" CXXFLAGS="-fdiagnostics-color"
make -j8

notice_it "Building Semigroups package documentation for archives (using makedoc.g)"

run_gap <<GAPInput
LogTo("makedoc.log");
if not IsPackageMarkedForLoading("$PKG", "") then
SetPackagePath("$PKG", ".");
fi;
PushOptions(rec(relativePath:="../../.."));
Read("makedoc.g");
GAPInput
rm -f doc/*.lab doc/*.tex
rm -f doc/*.aux doc/*.bbl doc/*.blg doc/*.brf doc/*.idx doc/*.ilg doc/*.ind doc/*.log doc/*.out doc/*.pnr doc/*.tst

! grep -E "WARNING: non resolved reference" makedoc.log
rm -f makedoc.log
make distclean

# The next line stop release-gap-package from trying to rebuild the doc
# Ideally the makedoc.g file would be included in the distro anyway
rm -f makedoc.g

notice_it "Fixing the links in the documentation"
for f in ./*/*.htm* ; do
sed 's;href="/.*digraphs-.*/doc;href="https://digraphs.github.io/Digraphs/doc/;g' "$f" > "$f.bak"
mv "$f.bak" "$f"
sed 's;href="/.*io-.*/doc;href="https://gap-packages.github.io/io/doc/;g' "$f" > "$f.bak"
mv "$f.bak" "$f"
sed 's;href="/.*smallsemi-.*/doc;href="https://gap-packages.github.io/smallsemi/doc/;g' "$f" > "$f.bak"
mv "$f.bak" "$f"
sed 's;href="/.*images-.*/doc;href="https://gap-packages.github.io/images/doc/;g' "$f" > "$f.bak"
mv "$f.bak" "$f"
sed 's;href="/.*GAPDoc-.*/doc;href="http://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc/doc/;g' "$f" > "$f.bak"
mv "$f.bak" "$f"
done

notice_it "Finished running Semigroup package .release script!!!"
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ Copyright © 2011-21 [James D. Mitchell][] et al.

Licensing information can be found in the `LICENSE` file.

### Version 3.4.2 (released 07/02/2021)

This is a minor release resolving some issues in v3.4.1 [James D. Mitchell][],
and with a number of improvements by [Wilf A. Wilson][].

### Version 3.4.1 (released 28/01/2021)

This is a minor release including some bugfixes and improvements. The required
Expand Down
10 changes: 5 additions & 5 deletions PackageInfo.g
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
##

## <#GAPDoc Label="PKGVERSIONDATA">
## <!ENTITY VERSION "3.4.1">
## <!ENTITY VERSION "3.4.2">
## <!ENTITY GAPVERS "4.10.0">
## <!ENTITY ARCHIVENAME "semigroups-3.4.2">
## <!ENTITY COPYRIGHTYEARS "2011-21">
## <!ENTITY DATASTRUCTURESVERS "0.2.5">
## <!ENTITY DIGRAPHSVERS "1.2.0">
## <!ENTITY GENSSVERS "1.6.5">
## <!ENTITY IMAGESVERS "1.3.0">
## <!ENTITY IOVERS "4.5.1">
## <!ENTITY ORBVERS "4.8.2">
## <!ENTITY ARCHIVENAME "semigroups-3.4.1">
## <!ENTITY COPYRIGHTYEARS "2011-20">
## <#/GAPDoc>

BindGlobal("_RecogsFunnyNameFormatterFunction",
Expand Down Expand Up @@ -49,8 +49,8 @@ _STANDREWS := Concatenation(["Mathematical Institute, ",
SetPackageInfo(rec(
PackageName := "Semigroups",
Subtitle := "A package for semigroups and monoids",
Version := "3.4.1",
Date := "28/01/2021", # dd/mm/yyyy format
Version := "3.4.2",
Date := "07/02/2021", # dd/mm/yyyy format
License := "GPL-3.0-or-later",

ArchiveFormats := ".tar.gz",
Expand Down
1 change: 1 addition & 0 deletions VERSIONS
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
##
##

release 3.4.2 - 07/02/2021
release 3.4.1 - 28/01/2021
release 3.4.0 - 28/08/2020
release 3.3.2 - 28/06/2020
Expand Down
4 changes: 2 additions & 2 deletions doc/isorms.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<Item>
<C><A>triple</A>[3]</C> should be a list of elements from the
underlying group of <A>R2</A>. If the
<Ref Attr="Matrix" Label="for Rees matrix semigroups" BookName="ref"/>
<Ref Attr="Matrix" BookName="ref"/>
of <A>R1</A> has <M>m</M> columns
and <M>n</M> rows, then the list should have length <M>m + n</M>,
where the first <M>m</M> entries should correspond to the columns of
Expand Down Expand Up @@ -284,7 +284,7 @@ gap> ImagesElm(map, RMSElement(R, 1, (2, 8), 2));
<Ref Attr="UnderlyingSemigroup" Label="for a Rees 0-matrix semigroup"
BookName="ref"/>
as <A>S</A> but the
<Ref Attr="Matrix" Label="for Rees matrix semigroups" BookName="ref"/>
<Ref Attr="Matrix" BookName="ref"/>
of <C>T</C> has been canonicalized. The output
<C>T</C> is canonical in the sense that for any two inputs
which are isomorphic Rees zero matrix semigroups the output of this
Expand Down
2 changes: 1 addition & 1 deletion doc/main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Text='Digraphs'>https://digraphs.github.io/Digraphs</URL></Alt><Alt
Only='Text'><Package>Digraphs</Package></Alt>">
<!ENTITY datastructures "<Alt Not='Text'><URL
Text='Digraphs'>https://gap-packages.github.io/datastructures</URL></Alt><Alt
Text='datastructures'>https://gap-packages.github.io/datastructures</URL></Alt><Alt
Only='Text'><Package>datastructures</Package></Alt>">
<!ENTITY Orb "<Alt Not='Text'><URL Text='Orb'>
https://gap-packages.github.io/orb/
Expand Down
3 changes: 1 addition & 2 deletions makedoc.g
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
## gap makedoc.g
##

PACKAGE := "Semigroups";
LoadPackage("GAPDoc");
LoadPackage("semigroups");

SemigroupsMakeDoc();
CopyHTMLStyleFiles("doc");
GAPDocManualLab(PACKAGE);
GAPDocManualLab("Semigroups");

QUIT;

0 comments on commit 7fcd59b

Please sign in to comment.