Skip to content

Commit a29370a

Browse files
authored
Merge pull request #201 from cpp-lln-lab/dev
[REL] 1.3.0
2 parents 028bda7 + 1de9e72 commit a29370a

File tree

86 files changed

+1059
-427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1059
-427
lines changed

.github/release-drafter.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
template: |
2+
## Release Notes
3+
4+
## CHANGES
5+
$CHANGES

.github/workflows/check_md_links.yml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
push:
77
branches:
88
- master
9+
- dev
910
pull_request:
1011
branches: ['*']
1112

.github/workflows/miss_hit.yml

-42
This file was deleted.

.github/workflows/run_tests.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,34 @@ on:
44
push:
55
branches:
66
- master
7+
- dev
78
pull_request:
89
branches: ['*']
910

1011
jobs:
12+
1113
build:
1214
runs-on: ubuntu-latest
15+
1316
steps:
1417
- uses: actions/checkout@v3
1518
with:
1619
submodules: true
17-
fetch-depth: 1
20+
fetch-depth: 0
21+
1822
- name: MOxUnit Action
1923
uses: joergbrech/[email protected]
2024
with:
2125
tests: tests
2226
src: src
2327
with_coverage: true
2428
cover_xml_file: coverage.xml
29+
2530
- name: Code coverage
2631
uses: codecov/codecov-action@v3
2732
with:
2833
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
2934
file: coverage.xml # optional
3035
flags: unittests # optional
3136
name: codecov-umbrella # optional
32-
fail_ci_if_error: true # optional (default = false)
37+
fail_ci_if_error: false # optional (default = false)

.gitignore

+41-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,54 @@
11
*DS_Store
22

3-
*.m~
4-
*octave-workspace
5-
63
.vscode/*
74

8-
# exclude content of logfiles folders
95
*.tsv
6+
107
*.mat
11-
check_my_code_report.txt
128

139
# exclude content of files for virtual env (mostly for the doc)
1410
cpp_ptb
11+
env
1512

1613
# ignore file created by sphynx
1714
/docs/build
1815

19-
# exclude node js stuff
20-
node_modules/*
21-
package-lock.json
16+
# exclude temp files from tests and coverage
17+
test_report.log
18+
*coverage*
19+
20+
## MATLAB / OCTAVE gitignore template
21+
22+
# From : https://github.com/github/gitignore/blob/master/Global/MATLAB.gitignore
23+
24+
# Windows default autosave extension
25+
*.asv
26+
27+
# OSX / *nix default autosave extension
28+
*.m~
29+
30+
# Compiled MEX binaries (all platforms)
31+
*.mex*
32+
33+
# Packaged app and toolbox files
34+
*.mlappinstall
35+
*.mltbx
36+
37+
# Generated helpsearch folders
38+
helpsearch*/
39+
40+
# Simulink code generation folders
41+
slprj/
42+
sccprj/
43+
44+
# Matlab code generation folders
45+
codegen/
46+
47+
# Simulink autosave extension
48+
*.autosave
49+
50+
# Simulink cache files
51+
*.slxc
52+
53+
# Octave session info
54+
octave-workspace

.zenodo.json

-37
This file was deleted.

CITATION.cff

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
cff-version: 1.2.0
2+
3+
title: "CPP PTB"
4+
5+
version: 1.3.0
6+
7+
abstract: a set of function to make it easier to create behavioral, EEG, fMRI experiment with psychtoolbox .
8+
9+
message: "If you use this software, please cite it as below."
10+
11+
repository-code: "https://github.com/cpp-lln-lab/CPP_PTB"
12+
13+
identifiers:
14+
- description: This is the collection of archived snapshots of all releases of CPP PTB
15+
type: doi
16+
value: "10.5281/zenodo.4007672"
17+
18+
contact:
19+
- affiliation: "Université catholique de Louvain"
20+
21+
family-names: Gau
22+
given-names: Rémi
23+
24+
authors:
25+
- family-names: "Gau"
26+
given-names: "Rémi"
27+
orcid: "https://orcid.org/0000-0002-1535-9767"
28+
affiliation: "Université catholique de Louvain"
29+
30+
- family-names: "Barilari"
31+
given-names: "Marco"
32+
orcid: "https://orcid.org/0000-0002-3313-3120"
33+
affiliation: "Université catholique de Louvain"
34+
35+
- family-names: "Battal"
36+
given-names: "Ceren"
37+
orcid: "https://orcid.org/0000-0002-9844-7630"
38+
affiliation: "Université catholique de Louvain"
39+
40+
- family-names: "Falagiarda"
41+
given-names: "Federica"
42+
orcid: "https://orcid.org/0000-0001-7844-1605"
43+
affiliation: "Université catholique de Louvain"
44+
45+
- family-names: "Shahzad"
46+
given-names: "Iqra"
47+
orcid: "https://orcid.org/0000-0002-8724-7668"
48+
affiliation: "Université catholique de Louvain"
49+
50+
license: MIT license
51+
52+
keywords:
53+
- PsychToolBox
54+
- neuroscience
55+
- MATLAB
56+
- Octave

Makefile

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# TODO make more general to use the local matlab version
2+
MATLAB = /usr/local/MATLAB/R2017a/bin/matlab
3+
ARG = -nodisplay -nosplash -nodesktop
4+
5+
lint:
6+
mh_style --fix && mh_metric --ci && mh_lint
7+
8+
test:
9+
$(MATLAB) $(ARG) -r "runTests; exit()"
10+
11+
version.txt: CITATION.cff
12+
grep -w "^version" CITATION.cff | sed "s/version: /v/g" > version.txt
13+
14+
validate_cff: CITATION.cff
15+
cffconvert --validate
16+
17+
manual:
18+
cd docs && sh create_manual.sh

README.md

+13-59
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,17 @@
1-
<!-- lint disable -->
2-
3-
**Documentation**
4-
51
[![Documentation Status: stable](https://readthedocs.org/projects/cpp-ptb/badge/?version=stable)](https://cpp-ptb.readthedocs.io/en/stable/?badge=stable)
6-
7-
**Cite it**
8-
92
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4007672.svg)](https://doi.org/10.5281/zenodo.4007672)
10-
11-
**Unit tests and coverage**
12-
133
[![](https://img.shields.io/badge/Octave-CI-blue?logo=Octave&logoColor=white)](https://github.com/cpp-lln-lab/CPP_PTB/actions)
144
![](https://github.com/cpp-lln-lab/CPP_PTB/workflows/CI/badge.svg)
15-
165
[![codecov](https://codecov.io/gh/cpp-lln-lab/CPP_PTB/branch/master/graph/badge.svg)](https://codecov.io/gh/cpp-lln-lab/CPP_PTB)
17-
18-
**Contributors**
19-
20-
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
216
[![All Contributors](https://img.shields.io/badge/all_contributors-5-orange.svg?style=flat-square)](#contributors-)
22-
<!-- ALL-CONTRIBUTORS-BADGE:END -->
237

248
# CPP_PTB
259

26-
<!-- TOC -->
27-
28-
- [CPP_PTB](#cpp_ptb)
29-
- [Documentation](#documentation)
30-
- [Content](#content)
31-
- [Code style guide](#code-style-guide)
32-
- [Unit tests](#unit-tests)
33-
- [Contributors ✨](#contributors-)
34-
35-
<!-- /TOC -->
36-
37-
<!-- lint enable -->
10+
- [CPP_PTB](#cpp_ptb)
11+
- [Documentation](#documentation)
12+
- [Content](#content)
13+
- [Contributing](#contributing)
14+
- [Contributors ✨](#contributors-)
3815

3916
This is the Crossmodal Perception and Plasticity lab (CPP) PsychToolBox (PTB)
4017
toolbox.
@@ -64,39 +41,16 @@ All the documentation and installtion information is accessible
6441
└── tests # all the tests that that can be run by github actions
6542
```
6643

67-
## Code style guide
68-
69-
We use the `camelCase` to more easily differentiates our functions from the ones
70-
from PTB that use a `PascalCase`.
71-
72-
In practice, we use the following regular expression for function names:
73-
`[a-z]+(([A-Z]|[0-9]){1}[a-z]+)*`.
74-
75-
> Regular expressions look scary but are SUPER useful to sort through filenames:
76-
>
77-
> - A quick [intro to regular expression](https://www.rexegg.com/)
78-
>
79-
> - And many websites allow you to "design and test" your regular expression:
80-
> - [regexper](https://regexper.com/#%5Ba-z%5D%2B%28%28%5BA-Z%5D%7C%5B0-9%5D%29%7B1%7D%5Ba-z%5D%2B%29)
81-
> - ...
82-
83-
We keep the McCabe complexity below 15 as reported by the
84-
[check_my_code function](https://github.com/Remi-Gau/check_my_code) or the
85-
[MISS_HIT code checker](https://florianschanda.github.io/miss_hit). A couple of
86-
code quality metrics are also checked automatically by MISS_HIT (avoiding
87-
functions with too many nested `if` blocks).
88-
89-
We use the
90-
[MISS_HIT linter](https://florianschanda.github.io/miss_hit/style_checker.html)
91-
to automatically fix some linting issues.
92-
93-
The code style and quality is also checked during the
94-
[continuous integration](.github/workflows/miss_hit.yml).
44+
## Contributing
9545

96-
## Unit tests
46+
Feel free to open issues to report a bug and ask for improvements.
9747

98-
Unit tests are run with the mox unit toolbox and automated with github action on
99-
Octave.
48+
If you want to contribute, have a look at our
49+
[contributing guidelines](https://github.com/cpp-lln-lab/.github/blob/main/CONTRIBUTING.md)
50+
that are meant to guide you and help you get started. If something is not clear
51+
or you get stuck: it is more likely we did not do good enough a job at
52+
explaining things. So do not hesitate to open an issue, just to ask for
53+
clarification.
10054

10155
## Contributors ✨
10256

0 commit comments

Comments
 (0)