Skip to content

Commit 8307689

Browse files
authored
Merge branch 'main' into enh_trans
2 parents 5795c33 + af0ee62 commit 8307689

File tree

6 files changed

+21
-3
lines changed

6 files changed

+21
-3
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,15 @@
145145
"contributions": [
146146
"bug"
147147
]
148+
},
149+
{
150+
"login": "christine0903",
151+
"name": "Christine Chouinard-Leclaire",
152+
"avatar_url": "https://avatars.githubusercontent.com/u/70207207?v=4",
153+
"profile": "https://github.com/christine0903",
154+
"contributions": [
155+
"ideas"
156+
]
148157
}
149158
],
150159
"contributorsPerLine": 7,

.github/workflows/validate_cff.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ jobs:
3535
pip3 install cffconvert
3636
3737
- name: Validate CITATION.cff
38-
run: cffconvert --validate
38+
run: make validate_cff

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ repos:
5555
- id: black
5656

5757
- repo: https://github.com/asottile/reorder_python_imports
58-
rev: v3.3.0
58+
rev: v3.8.1
5959
hooks:
6060
- id: reorder-python-imports

CITATION.cff

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ authors:
8080
orcid: "https://orcid.org/0000-0001-8681-5267"
8181
affiliation: "Université catholique de Louvain"
8282

83+
- family-names: "Chouinard-Leclaire"
84+
given-names: "Christine"
85+
orcid: "https://orcid.org/0000-0002-1066-6266"
86+
affiliation: "Université de Montréal"
87+
8388
license: GPL-3.0
8489

8590
keywords:

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ fix_submodule: ## Fix any submodules that would not be checked out
4848
version.txt: CITATION.cff
4949
grep -w "^version" CITATION.cff | sed "s/version: /v/g" > version.txt
5050

51+
validate_cff: ## Validate the citation file
52+
cffconvert --validate
53+
5154

5255
################################################################################
5356
# doc

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
1212
[![codecov](https://codecov.io/gh/cpp-lln-lab/CPP_SPM/branch/main/graph/badge.svg?token=PMQYH0DIPX)](https://codecov.io/gh/cpp-lln-lab/CPP_SPM)
1313
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3554331.svg)](https://doi.org/10.5281/zenodo.3554331)
14-
[![All Contributors](https://img.shields.io/badge/all_contributors-12-orange.svg?style=flat-square)](https://github.com/cpp-lln-lab/CPP_SPM#contributors)
14+
[![All Contributors](https://img.shields.io/badge/all_contributors-13-orange.svg?style=flat-square)](https://github.com/cpp-lln-lab/CPP_SPM#contributors)
1515

1616
<!-- markdown-link-check-enable -->
1717

@@ -180,6 +180,7 @@ Thanks goes to these wonderful people
180180
<td align="center"><a href="https://github.com/mcgnunes"><img src="https://avatars.githubusercontent.com/u/98760858?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Márcia Nunes</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_SPM/issues?q=author%3Amcgnunes" title="Bug reports">🐛</a></td>
181181
<td align="center"><a href="https://cpplab.be"><img src="https://avatars0.githubusercontent.com/u/55407947?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Olivier Collignon</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_SPM/commits?author=OliColli" title="Code">💻</a> <a href="#design-OliColli" title="Design">🎨</a> <a href="https://github.com/cpp-lln-lab/CPP_SPM/commits?author=OliColli" title="Documentation">📖</a></td>
182182
<td align="center"><a href="https://remi-gau.github.io/"><img src="https://avatars3.githubusercontent.com/u/6961185?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Remi Gau</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_SPM/commits?author=Remi-Gau" title="Code">💻</a> <a href="https://github.com/cpp-lln-lab/CPP_SPM/commits?author=Remi-Gau" title="Documentation">📖</a> <a href="#infra-Remi-Gau" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#design-Remi-Gau" title="Design">🎨</a> <a href="https://github.com/cpp-lln-lab/CPP_SPM/pulls?q=is%3Apr+reviewed-by%3ARemi-Gau" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/cpp-lln-lab/CPP_SPM/issues?q=author%3ARemi-Gau" title="Bug reports">🐛</a> <a href="https://github.com/cpp-lln-lab/CPP_SPM/commits?author=Remi-Gau" title="Tests">⚠️</a></td>
183+
<td align="center"><a href="https://github.com/christine0903"><img src="https://avatars.githubusercontent.com/u/70207207?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Christine Chouinard-Leclaire</b></sub></a><br /><a href="#ideas-christine0903" title="Ideas, Planning, & Feedback">🤔</a></td>
183184
</tr>
184185
</table>
185186

0 commit comments

Comments
 (0)