Merge pull request #3226 from mahrud/quickfix/stuff

Assorted changes and updates
Macaulay2 · May 14, 2024 · 4632d89 · 4632d89
2 parents 7df3eb4 + 00985e0
commit 4632d89
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 17 deletions.
diff --git a/M2/BUILD/docker/testbot/Dockerfile b/M2/BUILD/docker/testbot/Dockerfile
@@ -2,13 +2,13 @@
 # Net usage:  <200MB
 # Disk usage: <700MB
 
-FROM debian:bullseye
+FROM debian:bookworm
 
 # Setup the system
 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates debian-keyring git && apt-get clean
 
 # Install Macaulay2
-RUN echo "deb [signed-by=/usr/share/keyrings/debian-maintainers.gpg] https://people.debian.org/~dtorrance/debian bullseye/" >> /etc/apt/sources.list && apt-get update && apt-get install -y --no-install-recommends macaulay2 && apt-get clean
+RUN echo "deb [signed-by=/usr/share/keyrings/debian-keyring.gpg] https://people.debian.org/~dtorrance/debian bookworm/" >> /etc/apt/sources.list && apt-get update && apt-get install -y --no-install-recommends macaulay2 4ti2 cohomcalg coinor-csdp gfan nauty normaliz topcom && apt-get clean
 
 # Add non-root user for using Macaulay2
 RUN useradd -G sudo -g root -u 1000 -m macaulay && echo "macaulay ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers

diff --git a/M2/BUILD/docker/testbot/Makefile b/M2/BUILD/docker/testbot/Makefile
@@ -2,7 +2,7 @@ include ../Makefile
 
 ## Parameters
 TAG = macaulay2
-GHTAG = ghcr.io/mahrud/macaulay2:latest
+GHTAG = ghcr.io/macaulay2/testbot:latest
 
 tag:;	docker tag $(TAG) $(GHTAG)
 push:;	docker push $(GHTAG)
diff --git a/M2/BUILD/mahrud/markdown-changelog.m2 → M2/BUILD/mahrud/changelog-markdown.m2 b/M2/BUILD/mahrud/markdown-changelog.m2 → M2/BUILD/mahrud/changelog-markdown.m2
@@ -1,16 +1,15 @@
 restart
 importFrom_Core {"markdown"}
 
-ver = "1.17"
-illinois = "https://faculty.math.illinois.edu/Macaulay2/doc/Macaulay2-" | ver | "/share"
+ver = version#"VERSION"
+page = "changes, " | ver
+addr = "https://www.macaulay2.com/doc/Macaulay2-" | ver | "/share"
 
-changelog = markdown help("changes, " | ver);
-changelog = replace("/home/.*?/common/share", illinois, changelog);
-changelog = replace("common/share", illinois, changelog);
-changelog = replace("https://faculty.math.illinois.edu", "http://www2.macaulay2.com", changelog);
+changelog = markdown help page;
+changelog = replace("/home/.*?/share", addr, changelog);
+changelog = replace("common/share", addr, changelog);
 ("changelog-" | ver | ".md") << changelog << close
 
-
 restart
 importFrom_Core { "markdown", "TO", "TT", "IMG", "HREF" };
 X = help "packages provided with Macaulay2";

diff --git a/M2/Macaulay2/d/actors5.d b/M2/Macaulay2/d/actors5.d
@@ -2122,9 +2122,7 @@ showtimefun(a:Code):Expr := (
      ret);
 setupop(timeS,showtimefun);
 
-header "
-extern void set_gftable_dir(char *); /* defined in library factory, as patched by us */
-";
+header "extern void set_gftable_dir(char *); /* defined in library factory, as patched by us */";
 setFactoryGFtableDirectory(e:Expr):Expr := (
      when e is d:stringCell do (
      	  Ccode(void,"set_gftable_dir(", tocharstar(d.v), ")");

diff --git a/M2/Macaulay2/d/arithmetic.d b/M2/Macaulay2/d/arithmetic.d
@@ -1,6 +1,7 @@
 --		Copyright 1994-2006,2010 by Daniel R. Grayson
 
 export nothing := void();
+export size_t := integerType "size_t";
 export uchar := integerType "unsigned char";
 export short := integerType "short";
 export ushort := integerType "unsigned short";

diff --git a/M2/Macaulay2/m2/matrix2.m2 b/M2/Macaulay2/m2/matrix2.m2
@@ -442,10 +442,9 @@ indices RingElement := (f) -> rawIndices raw f
 indices Matrix := (f) -> rawIndices raw f
 
 support = method()
-support RingElement := support Matrix := (f) -> (
-     x := rawIndices raw f;
-     apply(x, i -> (ring f)_i))
-support Ideal := (I) -> rsort toList sum apply(flatten entries generators I, f -> set support f)
+support RingElement :=
+support Matrix      := f -> apply(try rawIndices raw f else {}, i -> (ring f)_i)
+support Ideal       := I -> support generators I
 --------------------
 -- homogenization --
 --------------------

diff --git a/M2/Macaulay2/tests/normal/support.m2 b/M2/Macaulay2/tests/normal/support.m2
@@ -0,0 +1,5 @@
+R = QQ[x,y,z,w]
+assert(support ideal"x,xy,xy-zw" == R_*)
+assert(support ideal() == {})
+assert(support id_(ZZ^3) == {})
+