Skip to content

Commit

Permalink
Merge branch 'main' into TAP
Browse files Browse the repository at this point in the history
  • Loading branch information
juanmcloaiza authored Jan 17, 2025
2 parents 5fa63fb + ca584f6 commit 7b54c49
Show file tree
Hide file tree
Showing 129 changed files with 2,536 additions and 12,378 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_devtests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ jobs:
run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
- name: Upload coverage to codecov
if: contains(matrix.toxenv,'-cov')
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v5.0.7
with:
file: ./coverage.xml
2 changes: 1 addition & 1 deletion .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
- name: Upload coverage to codecov
if: contains(matrix.toxenv,'-cov')
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v5.0.7
with:
file: ./coverage.xml

Expand Down
6 changes: 6 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Austen Groener <[email protected]> <[email protected]>
Ayush Yadav <[email protected]>
Benjamin Alan Weaver <[email protected]> <[email protected]>
Benjamin Alan Weaver <[email protected]> <[email protected]>
Brett Morris <[email protected]> <[email protected]>
Brian Svoboda <[email protected]> <[email protected]>
Brigitta Sipőcz <[email protected]>
Brigitta Sipőcz <[email protected]> <[email protected]>
Caden Armstrong <[email protected]>
Expand All @@ -19,6 +21,8 @@ Clara Brasseur <[email protected]>
David Collom <[email protected]> <[email protected]>
David Collom <[email protected]> <[email protected]>
David Collom <[email protected]> <[email protected]>
David Collom <[email protected]> <[email protected]>
David Gonzalez <[email protected]> <[email protected]>
Dino Bektesevic <[email protected]>
E. Madison Bray <[email protected]>
E. Madison Bray <[email protected]> <[email protected]>
Expand Down Expand Up @@ -57,6 +61,7 @@ Jon Juaristi Campillo <[email protected]>
Jonathan Gagne <[email protected]>
Jordan Mirocha <[email protected]> <[email protected]>
Jorge Fernandez Hernandez <[email protected]>
Jorge Fernandez Hernandez <[email protected]> <[email protected]>
Juan Carlos Segovia <[email protected]>
Juanjo Bazán <[email protected]>
Julien Milli <[email protected]>
Expand Down Expand Up @@ -91,6 +96,7 @@ Prajwel Joseph <[email protected]>
Raul Gutierrez <[email protected]> <Raul [email protected]>
Raul Gutierrez <[email protected]> <[email protected]>
Rounak Agarwal <[email protected]>
Sam Bianco <[email protected]> <[email protected]>
Sam Lee <[email protected]>
Sashank Mishra <[email protected]>
Simon Conseil <[email protected]> <[email protected]>
Expand Down
Loading

0 comments on commit 7b54c49

Please sign in to comment.