Skip to content

Commit 4b372f2

Browse files
applied PackageJanitor
1 parent a1d094c commit 4b372f2

File tree

6 files changed

+86
-19
lines changed

6 files changed

+86
-19
lines changed

.github/workflows/Tests.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
image: [gapsystem/gap-docker, gapsystem/gap-docker-master]
17+
fail-fast: false
1718
runs-on: ubuntu-latest
1819
container:
1920
image: ${{ matrix.image }}
@@ -31,10 +32,10 @@ jobs:
3132
git clone --depth 1 https://github.com/gap-packages/AutoDoc.git
3233
git clone --depth 1 https://github.com/homalg-project/homalg_project.git
3334
git clone --depth 1 https://github.com/homalg-project/CAP_project.git
34-
git clone --depth 1 https://github.com/homalg-project/CategoryConstructor.git
35-
git clone --depth 1 https://github.com/homalg-project/FunctorCategories.git
3635
git clone --depth 1 https://github.com/homalg-project/HigherHomologicalAlgebra.git
3736
git clone --depth 1 https://github.com/homalg-project/QPA2.git
37+
git clone --depth 1 https://github.com/homalg-project/CategoryConstructor.git
38+
git clone --depth 1 https://github.com/homalg-project/FunctorCategories.git
3839
git clone --depth 1 https://github.com/homalg-project/Toposes.git
3940
git clone --depth 1 https://github.com/homalg-project/FinSetsForCAP.git
4041
git clone --depth 1 https://github.com/homalg-project/SubcategoriesForCAP.git
@@ -53,7 +54,7 @@ jobs:
5354
if [ "${{ matrix.image }}" = "gapsystem/gap-docker" ] && [ "$CUR_SHA" = "$(git rev-parse origin/master)" ] && [ $(dirname "$GITHUB_REPOSITORY") = "homalg-project" ]; then \
5455
git worktree add gh-pages/ gh-pages || (echo "There was an error. Make sure there is a branch named 'gh-pages'. See https://github.com/homalg-project/PackageJanitor#error-there-was-an-error-make-sure-there-is-a-branch-named-gh-pages"; exit 1); \
5556
git checkout master; \
56-
./make_dist.sh --token "${{ secrets.GITHUB_TOKEN }}"; \
57+
LANG=C.UTF-8 ./make_dist.sh --token "${{ secrets.GITHUB_TOKEN }}"; \
5758
else \
5859
echo "Not making a release."; \
5960
fi

PackageInfo.g

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ SetPackageInfo( rec(
1111
PackageName := "Algebroids",
1212
Subtitle := "Algebroids and bialgebroids as preadditive categories generated by enhanced quivers",
1313
Version := Maximum( [
14-
"2020.09.07", ## Mohamed's version
14+
"2020.10-01", ## Mohamed's version
1515
## this line prevents merge conflicts
16-
"2020.09.08", ## Kamal's version
16+
"2020.09-08", ## Kamal's version
1717
## this line prevents merge conflicts
18-
"2019.02.12", ## Florian's version
18+
"2019.02-12", ## Florian's version
1919
## this line prevents merge conflicts
20-
"2019.10.30", ## Sepp's version
20+
"2019.10-30", ## Sepp's version
2121
] ),
2222

2323
Date := ~.Version{[ 1 .. 10 ]},
24-
Date := Concatenation( ~.Version{[ 9, 10 ]}, "/", ~.Version{[ 6, 7 ]}, "/", ~.Version{[ 1 .. 4 ]} ),
24+
Date := Concatenation( "01/", ~.Version{[ 6, 7 ]}, "/", ~.Version{[ 1 .. 4 ]} ),
2525
License := "GPL-2.0-or-later",
2626

2727
Persons := [
@@ -30,11 +30,11 @@ Persons := [
3030
IsMaintainer := true,
3131
FirstNames := "Mohamed",
3232
LastName := "Barakat",
33-
WWWHome := "https://mohamed-barakat.github.io",
33+
WWWHome := "https://mohamed-barakat.github.io/",
3434
Email := "mohamed.barakat@uni-siegen.de",
3535
PostalAddress := Concatenation(
3636
"Walter-Flex-Str. 3\n",
37-
"57072 Siegen\n",
37+
"57068 Siegen\n",
3838
"Germany" ),
3939
Place := "Siegen",
4040
Institution := "University of Siegen",
@@ -99,7 +99,7 @@ README_URL := "https://homalg-project.github.io/Algebroids/README.md",
9999
ArchiveURL := Concatenation( "https://github.com/homalg-project/Algebroids/releases/download/v", ~.Version, "/Algebroids-", ~.Version ),
100100
# END URLS
101101

102-
ArchiveFormats := ".tar.gz",
102+
ArchiveFormats := ".tar.gz .zip",
103103

104104
## Status information. Currently the following cases are recognized:
105105
## "accepted" for successfully refereed packages

README.md

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,39 @@
11
<!-- BEGIN HEADER -->
2-
# Algebroids – Algebroids and bialgebroids as preadditive categories generated by enhanced quivers
2+
# Algebroids
33

4-
| Documentation | Build Status | Code Coverage |
5-
| ------------- | ------------ | ------------- |
6-
| [![HTML stable documentation][docs-img]][docs-url] | [![Build Status][tests-img]][tests-url] | [![Code Coverage][codecov-img]][codecov-url] |
4+
### Algebroids and bialgebroids as preadditive categories generated by enhanced quivers
5+
6+
| Documentation | Latest Release | Build Status | Code Coverage |
7+
| ------------- | -------------- | ------------ | ------------- |
8+
| [![HTML stable documentation][html-img]][html-url] [![PDF stable documentation][pdf-img]][pdf-url] | [![version][version-img]][version-url] [![date][date-img]][date-url] | [![Build Status][tests-img]][tests-url] | [![Code Coverage][codecov-img]][codecov-url] |
79

810
<!-- END HEADER -->
911

1012
<!-- BEGIN FOOTER -->
11-
[docs-img]: https://img.shields.io/badge/HTML-stable-blue.svg
12-
[docs-url]: https://homalg-project.github.io/Algebroids/doc/chap0_mj.html
13+
---
14+
15+
### Dependencies
16+
17+
To obtain current versions of all dependencies, `git clone` (or `git pull` to update) the following repositories:
18+
19+
| | Repository | URL |
20+
|--- | ---------- | --- |
21+
| 1. | **homalg_project** | https://github.com/homalg-project/homalg_project |
22+
| 2. | **CAP_project** | https://github.com/homalg-project/CAP_project |
23+
| 3. | **HigherHomologicalAlgebra** | https://github.com/homalg-project/HigherHomologicalAlgebra |
24+
| 4. | **QPA2** | https://github.com/homalg-project/QPA2 |
25+
26+
[html-img]: https://img.shields.io/badge/HTML-stable-blue.svg
27+
[html-url]: https://homalg-project.github.io/Algebroids/doc/chap0_mj.html
28+
29+
[pdf-img]: https://img.shields.io/badge/PDF-stable-blue.svg
30+
[pdf-url]: https://homalg-project.github.io/Algebroids/download_pdf.html
31+
32+
[version-img]: https://img.shields.io/endpoint?url=https://homalg-project.github.io/Algebroids/badge_version.json
33+
[version-url]: https://homalg-project.github.io/Algebroids/view_release.html
34+
35+
[date-img]: https://img.shields.io/endpoint?url=https://homalg-project.github.io/Algebroids/badge_date.json
36+
[date-url]: https://homalg-project.github.io/Algebroids/view_release.html
1337

1438
[tests-img]: https://github.com/homalg-project/Algebroids/workflows/Tests/badge.svg?branch=master
1539
[tests-url]: https://github.com/homalg-project/Algebroids/actions?query=workflow%3ATests+branch%3Amaster

makedoc.g

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ AutoDoc( rec(
2525
),
2626
),
2727
scaffold := rec(
28-
entities := [ "homalg", "CAP" ],
28+
entities := [ "homalg", "CAP", "QPA" ],
2929
),
3030
) );
3131

makedoc_with_overfull_hbox_warnings.g

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ AutoDoc( rec(
3636
),
3737
),
3838
scaffold := rec(
39-
entities := [ "homalg", "CAP" ],
39+
entities := [ "homalg", "CAP", "QPA" ],
4040
),
4141
) );
4242

release-gap-package

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ else
244244
tmp := GAPInfo.PackageInfoCurrent.ArchiveURL;
245245
Print("GAP_ERROR=\"The ArchiveURL has unexpected value '",tmp,"'\"\n");
246246
fi;
247+
Print("PDFFile=\"",GAPInfo.PackageInfoCurrent.PackageDoc.PDFFile,"\"\n");
247248
EOF
248249

249250
# evaluate the output of GAP, which should be valid shell script code
@@ -407,6 +408,13 @@ git archive --prefix="$BASENAME/" "$TAG" . | tar xf - -C "$TMP_DIR"
407408
# Build the package documentation, run autoconf, etc.
408409
cd "$TMP_DIR/$BASENAME"
409410

411+
# adjust date
412+
# Note that we cannot use sed's `-i` option for in-place editing, as
413+
# that is a non-portable extension of POSIX, which works differently in
414+
# BSD and GNU make.
415+
sed "s;Date := .*;Date := \"$(date +%d/%m/%Y)\",;" PackageInfo.g > PackageInfo.g.bak
416+
mv PackageInfo.g.bak PackageInfo.g
417+
410418
notice "Removing unnecessary files"
411419
rm -rf .github .circleci
412420
rm -f .git* .hg* .cvs*
@@ -451,6 +459,20 @@ fi
451459
# make sure every file is readable
452460
chmod -R a+r .
453461

462+
# adjust links to other manuals
463+
# Note that we cannot use sed's `-i` option for in-place editing, as
464+
# that is a non-portable extension of POSIX, which works differently in
465+
# BSD and GNU make.
466+
for f in ./*/*.htm* ; do
467+
sed 's;href="/home/gap/.gap/pkg/homalg_project/Modules/doc/;href="https://homalg-project.github.io/homalg_project/Modules/doc/;g' "$f" > "$f.bak"
468+
mv "$f.bak" "$f"
469+
done
470+
471+
for f in ./*/*.htm* ; do
472+
sed 's;href="/home/gap/.gap/pkg/homalg_project/homalg/doc/;href="https://homalg-project.github.io/homalg_project/homalg/doc/;g' "$f" > "$f.bak"
473+
mv "$f.bak" "$f"
474+
done
475+
454476
# basic sanity check
455477
fgrep -q -r '<a href="/' */*.htm* &&
456478
error "HTML manual contains absolute paths"
@@ -593,6 +615,26 @@ for EXT in $ARCHIVE_FORMATS ; do
593615
done
594616

595617

618+
######################################################################
619+
#
620+
# Upload PDF
621+
#
622+
cd "$TMP_DIR"
623+
echo ""
624+
625+
FULLNAME="$TMP_DIR/$BASENAME/$PDFFile"
626+
if [ ! -f "$FULLNAME" ] ; then
627+
error "could not find PDF"
628+
fi
629+
notice "Uploading PDF"
630+
response=$(curl --fail --progress-bar -o "$TMP_DIR/upload.log" \
631+
-X POST "$UPLOAD_URL/$RELEASE_ID/assets?name=$BASENAME.pdf" \
632+
-H "Accept: application/vnd.github.v3+json" \
633+
-H "Authorization: token $TOKEN" \
634+
-H "Content-Type: application/pdf" \
635+
--data-binary @"$FULLNAME")
636+
637+
596638
######################################################################
597639
#
598640
# Update the website

0 commit comments

Comments
 (0)