Skip to content

Commit dd741e2

Browse files
mohamed-barakatmohamed-barakat
authored
Merge pull request #41 from mohamed-barakat/devel
CapAndHomalg 1.6.8 -> 1.6.10
2 parents 4686347 + 62813de commit dd741e2

9 files changed

Lines changed: 102 additions & 22 deletions

File tree

‎.github/workflows/Codecov.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Codecov
2+
3+
on:
4+
workflow_run:
5+
workflows: ["Tests"]
6+
types:
7+
- completed
8+
9+
jobs:
10+
upload:
11+
if: >-
12+
github.event.workflow_run.conclusion == 'success' &&
13+
github.event.workflow_run.event != 'schedule'
14+
permissions:
15+
actions: read
16+
contents: read
17+
pull-requests: read
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Check out repo
21+
uses: actions/checkout@v4
22+
- name: Download coverage artifacts
23+
uses: actions/download-artifact@v4
24+
with:
25+
pattern: coverage
26+
path: /tmp/coverage-artifacts
27+
merge-multiple: true
28+
run-id: ${{ github.event.workflow_run.id }}
29+
github-token: ${{ secrets.GITHUB_TOKEN }}
30+
- name: Restore coverage files
31+
run: |
32+
cp -v /tmp/coverage-artifacts/*.json . 2>/dev/null || true
33+
- name: Resolve PR number on PR events
34+
id: resolve_pr
35+
env:
36+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37+
run: |
38+
PR_NUMBER=""
39+
if [ "${{ github.event.workflow_run.event }}" = "pull_request" ]; then
40+
HEAD="${{ github.event.workflow_run.head_repository.owner.login }}:${{ github.event.workflow_run.head_branch }}"
41+
PR_NUMBER=$(gh api "repos/${{ github.repository }}/pulls?state=all&head=${HEAD}" --jq ".[0].number // empty")
42+
fi
43+
echo "pr_number=${PR_NUMBER}" >> "$GITHUB_OUTPUT"
44+
echo "Resolved PR: ${PR_NUMBER:-(none)}"
45+
- name: Upload to Codecov
46+
env:
47+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
48+
CODECOV_COMMIT_SHA: ${{ github.event.workflow_run.head_sha }}
49+
CODECOV_BRANCH: ${{ github.event.workflow_run.head_branch }}
50+
CODECOV_PR: ${{ steps.resolve_pr.outputs.pr_number }}
51+
run: ./dev/upload_codecov.sh

‎.github/workflows/Tests.yml‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ jobs:
3737
run: |
3838
curl --fail -X PUT -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos/$GITHUB_REPOSITORY/actions/workflows/Tests.yml/enable"
3939
- name: Check out repo
40-
uses: actions/checkout@v3
40+
uses: actions/checkout@v4
4141
with:
42-
# the persisted token interferes with the subsplit token used below
4342
persist-credentials: false
4443
fetch-depth: 0
4544
- name: Move checked out repo to GAP user root dir
@@ -66,10 +65,27 @@ jobs:
6665
- name: Test LoopIntegrals
6766
run: |
6867
make -C LoopIntegrals --trace -j $(nproc) --output-sync ci-test
69-
- name: Release package or simulate release
68+
- name: Process coverage files
69+
if: always() && matrix.image == 'ghcr.io/homalg-project/gap-docker:latest'
7070
run: |
7171
cd LoopIntegrals
7272
python3 dev/process_coverage.py
73+
- name: Collect coverage files
74+
if: always() && github.event_name != 'schedule' && matrix.image == 'ghcr.io/homalg-project/gap-docker:latest'
75+
run: |
76+
mkdir -p /tmp/coverage-collect
77+
cp LoopIntegrals/coverage*.json /tmp/coverage-collect/ 2>/dev/null || true
78+
- name: Upload coverage artifact
79+
if: always() && github.event_name != 'schedule' && matrix.image == 'ghcr.io/homalg-project/gap-docker:latest'
80+
uses: actions/upload-artifact@v4
81+
with:
82+
name: coverage
83+
path: /tmp/coverage-collect/
84+
if-no-files-found: ignore
85+
retention-days: 1
86+
- name: Release package or simulate release
87+
run: |
88+
cd LoopIntegrals
7389
git config --global user.name "Bot"
7490
git config --global user.email "empty"
7591
CUR_SHA=$(git rev-parse --verify HEAD)
@@ -81,10 +97,3 @@ jobs:
8197
else \
8298
TOKEN="${{ secrets.GITHUB_TOKEN }}" ./dev/simulate_dist.sh; \
8399
fi
84-
- name: Upload code coverage
85-
if: github.event_name != 'schedule' && matrix.image == 'ghcr.io/homalg-project/gap-docker:latest'
86-
env:
87-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
88-
run: |
89-
cd LoopIntegrals
90-
./dev/upload_codecov.sh

‎PackageInfo.g‎

Lines changed: 1 addition & 1 deletion
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 := "2025.12-01",
13+
Version := "2026.05-02",
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

‎dev/upload_codecov.sh‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,21 @@ else
2828
echo -e "\033[0;32mUsing CODECOV_TOKEN from environment variable.\033[0m"
2929
fi
3030

31+
# build extra args for commit/branch/PR override (used by workflow_run context)
32+
EXTRA_ARGS=""
33+
if [ -n "$CODECOV_COMMIT_SHA" ]; then
34+
EXTRA_ARGS="$EXTRA_ARGS -C $CODECOV_COMMIT_SHA"
35+
fi
36+
if [ -n "$CODECOV_BRANCH" ]; then
37+
EXTRA_ARGS="$EXTRA_ARGS -B $CODECOV_BRANCH"
38+
fi
39+
if [ -n "$CODECOV_PR" ]; then
40+
EXTRA_ARGS="$EXTRA_ARGS -P $CODECOV_PR"
41+
fi
42+
3143
# execute
3244
chmod +x codecov
33-
while ! ./codecov -Z -v -s ../ -t $CODECOV_TOKEN; do
45+
while ! ./codecov -Z -v -s ../ -t $CODECOV_TOKEN $EXTRA_ARGS; do
3446
echo "Codecov upload failed, retrying in 60s"
3547
sleep 60
3648
done

‎examples/1LoopBox.g‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,9 @@ gen2 := GeneratorsOfScalelessSectors( LD, [ 2, 2, 2, 2 ] );
121121
Display( gen2 );
122122
#! D1*D2*D3^2*D4^2,D1^2*D2*D3*D4^2,D1*D2^2*D3^2*D4,D1^2*D2^2*D3*D4
123123
prel2 := ColumnReversedMatrixOfCoefficientsOfParametricIBPs( LD, 2 );
124-
#! [ <A non-zero 7 x 11 matrix over an external ring>,
125-
#! [ D1_*D3_, D1_*D4_, D2_*D4_, D3_*D4_, D1_, D2_, D3_, D4_, 1, D1, D2 ] ]
124+
#! [ <A non-zero 9 x 13 matrix over an external ring>,
125+
#! [ D1_*D2_, D1_*D3_, D2_*D3_, D1_*D4_, D2_*D4_, D3_*D4_, D1_, D2_, D3_, D4_,
126+
#! 1, D1, D2 ] ]
126127
dibps := MatrixOfIBPRelationsWithDimensionShift( LD );
127128
#! <An unevaluated 5 x 1 matrix over a residue class ring>
128129
Display( dibps );

‎examples/julia/notebooks/1LoopBox.ipynb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"name": "stdout",
1111
"output_type": "stream",
1212
"text": [
13-
"CapAndHomalg v\u001b[32m1.6.8\u001b[39m\n",
13+
"CapAndHomalg v\u001b[32m1.6.10\u001b[39m\n",
1414
"Imported OSCAR's components GAP and Singular_jll\n",
1515
"Type: ?CapAndHomalg for more information\n"
1616
]
@@ -955,7 +955,7 @@
955955
"file_extension": ".jl",
956956
"mimetype": "application/julia",
957957
"name": "julia",
958-
"version": "1.12.1"
958+
"version": "1.12.6"
959959
}
960960
},
961961
"nbformat": 4,

‎examples/julia/notebooks/1LoopBox_using_Ore_algebra.ipynb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"name": "stdout",
5151
"output_type": "stream",
5252
"text": [
53-
"CapAndHomalg v\u001b[32m1.6.8\u001b[39m\n",
53+
"CapAndHomalg v\u001b[32m1.6.10\u001b[39m\n",
5454
"Imported OSCAR's components GAP and Singular_jll\n",
5555
"Type: ?CapAndHomalg for more information\n"
5656
]
@@ -1340,7 +1340,7 @@
13401340
"file_extension": ".jl",
13411341
"mimetype": "application/julia",
13421342
"name": "julia",
1343-
"version": "1.12.1"
1343+
"version": "1.12.6"
13441344
}
13451345
},
13461346
"nbformat": 4,

‎examples/julia/notebooks/1LoopTadpole.ipynb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"name": "stdout",
1111
"output_type": "stream",
1212
"text": [
13-
"CapAndHomalg v\u001b[32m1.6.8\u001b[39m\n",
13+
"CapAndHomalg v\u001b[32m1.6.10\u001b[39m\n",
1414
"Imported OSCAR's components GAP and Singular_jll\n",
1515
"Type: ?CapAndHomalg for more information\n"
1616
]
@@ -857,7 +857,7 @@
857857
"file_extension": ".jl",
858858
"mimetype": "application/julia",
859859
"name": "julia",
860-
"version": "1.12.1"
860+
"version": "1.12.6"
861861
}
862862
},
863863
"nbformat": 4,

‎examples/notebooks/1LoopBox.ipynb‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,14 @@
5050
"name": "stdout",
5151
"output_type": "stream",
5252
"text": [
53-
"CapAndHomalg v\u001b[32m1.6.8\u001b[39m\n",
53+
"\r",
54+
"CapAndHomalg v\u001b[32m1.6.10\u001b[39m\n"
55+
]
56+
},
57+
{
58+
"name": "stdout",
59+
"output_type": "stream",
60+
"text": [
5461
"Imported OSCAR's components GAP and Singular_jll\n",
5562
"Type: ?CapAndHomalg for more information\n"
5663
]
@@ -1035,7 +1042,7 @@
10351042
"file_extension": ".jl",
10361043
"mimetype": "application/julia",
10371044
"name": "julia",
1038-
"version": "1.12.3"
1045+
"version": "1.12.6"
10391046
}
10401047
},
10411048
"nbformat": 4,

0 commit comments

Comments
 (0)