Skip to content

Commit 9e8f862

Browse files
Merge pull request #32 from mohamed-barakat/devel
applied PackageJanitor
2 parents b1ca279 + 4e5025e commit 9e8f862

6 files changed

Lines changed: 27 additions & 21 deletions

File tree

.github/workflows/Tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
if [ -d "HigherHomologicalAlgebra/ToolsForHigherHomologicalAlgebra" ]; then make -C "HigherHomologicalAlgebra/ToolsForHigherHomologicalAlgebra" doc; fi
6262
if [ -d "homalg_project/homalg" ]; then make -C "homalg_project/homalg" doc; fi
6363
if [ -d "homalg_project/Modules" ]; then make -C "homalg_project/Modules" doc; fi
64-
if [ -d "CategoricalTowers/CategoryConstructor" ]; then make -C "CategoricalTowers/CategoryConstructor" doc; fi
64+
if [ -d "CategoricalTowers/ToolsForCategoricalTowers" ]; then make -C "CategoricalTowers/ToolsForCategoricalTowers" doc; fi
6565
if [ -d "CategoricalTowers/Toposes" ]; then make -C "CategoricalTowers/Toposes" doc; fi
6666
- name: Test LoopIntegrals
6767
run: |

PackageInfo.g

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SetPackageInfo( rec(
1010

1111
PackageName := "LoopIntegrals",
1212
Subtitle := "Compute master integrals using commutative and noncommutative methods from computational algebraic geometry",
13-
Version := "2023.11-04",
13+
Version := "2024.04-01",
1414

1515
Date := (function ( ) if IsBound( GAPInfo.SystemEnvironment.GAP_PKG_RELEASE_DATE ) then return GAPInfo.SystemEnvironment.GAP_PKG_RELEASE_DATE; else return Concatenation( ~.Version{[ 1 .. 4 ]}, "-", ~.Version{[ 6, 7 ]}, "-01" ); fi; end)( ),
1616

@@ -112,7 +112,7 @@ PackageDoc := rec(
112112
),
113113

114114
Dependencies := rec(
115-
GAP := ">= 4.12.1",
115+
GAP := ">= 4.13.0",
116116
NeededOtherPackages := [
117117
[ "GAPDoc", ">= 1.5" ],
118118
[ "MatricesForHomalg", ">= 2023.11-01" ],

dev/.release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ sed "s;Date := .*;Date := \"$(date -I)\",;" PackageInfo.g > PackageInfo.g.bak
1414
mv PackageInfo.g.bak PackageInfo.g
1515

1616
# replace links to packages which are possibly referenced in the documentation, keep this in sync with `Tests.yml.j2`
17-
for package in CAP_project/CAP CAP_project/CompilerForCAP CAP_project/MonoidalCategories CAP_project/CartesianCategories CAP_project/FreydCategoriesForCAP HigherHomologicalAlgebra/ToolsForHigherHomologicalAlgebra homalg_project/homalg homalg_project/Modules CategoricalTowers/CategoryConstructor CategoricalTowers/Toposes; do
17+
for package in CAP_project/CAP CAP_project/CompilerForCAP CAP_project/MonoidalCategories CAP_project/CartesianCategories CAP_project/FreydCategoriesForCAP HigherHomologicalAlgebra/ToolsForHigherHomologicalAlgebra homalg_project/homalg homalg_project/Modules CategoricalTowers/ToolsForCategoricalTowers CategoricalTowers/Toposes; do
1818

1919
# adjust links to other manuals
2020
# Note that we cannot use sed's `-i` option for in-place editing, as

dev/ci_gaprc

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
SetUserPreference( "ShortBanners", true );
2+
13
# Prefer GAPInfo.UserGapRoot over other package directories to prevent accidentally testing package
24
# versions distributed with GAP.
35

@@ -7,16 +9,7 @@ FORCE_LOADING_FROM_USER_GAP_ROOT := function ( )
79
package_info := GAPInfo.PackagesInfo.(name);
810
pos := PositionProperty( package_info, info -> StartsWith( info.InstallationPath, GAPInfo.UserGapRoot ) );
911
if pos <> fail then
10-
# work around https://github.com/gap-system/gap/pull/5178
11-
if IsBound( GAPInfo.PackagesLoaded.(name) ) then
12-
if StartsWith( GAPInfo.PackagesLoaded.(name)[1], GAPInfo.UserGapRoot ) then
13-
continue;
14-
else
15-
Error( "package already loaded at ", GAPInfo.PackagesLoaded.(name)[1] );
16-
fi;
17-
else
18-
SetPackagePath( name, package_info[pos].InstallationPath );
19-
fi;
12+
SetPackagePath( name, package_info[pos].InstallationPath );
2013
fi;
2114
od;
2215
end;

dev/release-gap-package

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,9 @@ command -v git >/dev/null 2>&1 ||
239239
error "the 'git' command was not found, please install it"
240240

241241
if [ "x$PYTHON" != x ] ; then
242-
:
242+
if ! command -v "$PYTHON" >/dev/null 2>&1; then
243+
error "Could not execute python from PYTHON environment variable"
244+
fi
243245
elif command -v python >/dev/null 2>&1; then
244246
PYTHON=python
245247
elif command -v python3 >/dev/null 2>&1; then
@@ -361,6 +363,7 @@ fi
361363
#
362364
# Determine GitHub repository and username, and the current branch
363365
#
366+
if [ $ONLY_TARBALL = no ] ; then
364367
notice "Using GitHub repository $REPO"
365368

366369
if [ "x$GITHUB_USER" = x ] ; then
@@ -371,11 +374,13 @@ if [ "x$GITHUB_USER" = x ] ; then
371374
fi
372375
notice "Using GitHub username $GITHUB_USER"
373376

374-
if [ "x$ONLY_TARBALL" = xno ] ; then
375-
BRANCH=$(git symbolic-ref -q --short HEAD)
376-
notice "Using branch $BRANCH"
377+
BRANCH=$(git symbolic-ref -q --short HEAD || echo)
378+
if [ "x$BRANCH" = x ] ; then
379+
notice "no branch! Cannot proceed, exiting."
380+
exit 1
381+
fi
382+
notice "Using branch $BRANCH"
377383
fi
378-
379384

380385
######################################################################
381386
#
@@ -507,7 +512,9 @@ find . -name .DS_Store -exec rm -f {} +
507512
# * perform additional sanity checks;
508513
# * ...
509514
if [ "x$RELEASE_SCRIPT" != x ] ; then
510-
. "$RELEASE_SCRIPT"
515+
. "$RELEASE_SCRIPT"
516+
# do not delete the custom release script since it might be reused, for example by additional packages of a monorepo
517+
# if it should be deleted, it can always simply delete itself
511518
elif [ -f .release ] ; then
512519
. ./.release
513520
rm -f .release
@@ -715,7 +722,7 @@ fi
715722
# BSD and GNU make.
716723
for f in ./*/*.htm* ; do
717724
sed \
718-
-e 's;href="../../../doc/;href="https://www.gap-system.org/Manuals/doc/;g' \
725+
-e 's;href="../../../doc/;href="https://docs.gap-system.org/doc/;g' \
719726
-e 's;href="../../../pkg/GAPDoc[^\/]*/doc/;href="http://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc/doc/;g' \
720727
-e 's;href="../../../pkg/gapdoc[^\/]*/doc/;href="http://www.math.rwth-aachen.de/~Frank.Luebeck/GAPDoc/doc/;g' \
721728
"$f" > "$f.bak"

makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ test-notebooks:
4343
rm modified_in out modified_out; \
4444
done
4545

46+
update-notebooks:
47+
cd examples/notebooks/; \
48+
for filename in *.ipynb; do \
49+
jupyter nbconvert --ExecutePreprocessor.kernel_name=julia-$$(julia -e 'print(VERSION.major); print("."); print(VERSION.minor)') --ExecutePreprocessor.record_timing=False --to notebook --inplace --execute "$$filename"; \
50+
done
51+
4652
test-spacing:
4753
# exit code 1 means no match, which is what we want here (exit code 2 signals an error)
4854
grep -R "[^ [\"] " gap/*.gi; test $$? -eq 1 || (echo "Duplicate spaces found" && exit 1)

0 commit comments

Comments
 (0)