Merge pull request #76 from cpp-lln-lab/target_same

Remi-Gau · web-flow · commit cf56587343c2 · 2021-06-24T19:16:24.000+02:00
Fix linting
diff --git a/.github/workflows/miss_hit_quality.yml b/.github/workflows/miss_hit_quality.yml
@@ -0,0 +1,38 @@
+name: miss_hit_quality
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches: '*'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+        fetch-depth: 1
+
+    - name: Set up Python 3.6
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.6
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip setuptools
+        pip3 install -r requirements.txt
+
+    - name: MISS_HIT Metrics
+      run: |
+        mh_metric --ci
+
+    - name: MISS_HIT Bug finder
+      run: |
+        mh_lint
diff --git a/.github/workflows/miss_hit_style.yml b/.github/workflows/miss_hit_style.yml
@@ -0,0 +1,34 @@
+name: miss_hit_style
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches: '*'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+        fetch-depth: 1
+
+    - name: Set up Python 3.6
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.6
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip setuptools
+        pip3 install -r requirements.txt
+
+    - name: MISS_HIT Code style
+      run: |
+        mh_style
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,36 @@
+repos:
+
+-   repo: local
+
+    hooks:
+
+    - id: mh_style
+      name: mh_style
+      entry: mh_style
+      args: [--process-slx, --fix]
+      files: ^(.*\.(m|slx))$
+      language: python
+      additional_dependencies: [miss_hit_core]
+
+    - id: mh_metric
+      name: mh_metric
+      entry: mh_metric
+      args: [--ci]
+      files: ^(.*\.(m|slx))$
+      language: python
+      additional_dependencies: [miss_hit_core]
+
+    - id: mh_lint
+      name: mh_lint
+      entry: mh_lint
+      files: ^(.*\.(m|slx))$
+      language: python
+      additional_dependencies: [miss_hit]
+
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v2.0.0
+  hooks:
+    - id: trailing-whitespace
+    - id: end-of-file-fixer
+    - id: check-yaml
+    - id: check-added-large-files
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -167,4 +167,4 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- prettier-ignore-end -->
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
-This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
diff --git a/docs/README.md b/docs/README.md
@@ -1 +1 @@
-# Documentation
+# Documentation
diff --git a/initEnv.m b/initEnv.m
@@ -1,5 +1,5 @@
 % (C) Copyright 2020 Agah Karakuzu
-% (C) Copyright 2019 CPP BIDS SPM-pipeline developpers
+% (C) Copyright 2019 CPP visual motion localizer developpers
 
 function initEnv
     % 1 - Check if version requirements
diff --git a/lib/CPP_BIDS b/lib/CPP_BIDS
@@ -1 +1 @@
-Subproject commit 269aa609262df425a56ff073b3f109a19e24a3cf
+Subproject commit 962c947fe38094da9561eeba5daa44993505f2c0
diff --git a/lib/README.md b/lib/README.md
@@ -1 +1 @@
-# External libraries and dependencies
+# External libraries and dependencies
diff --git a/lib/miss_hit.cfg b/lib/miss_hit.cfg
@@ -0,0 +1,3 @@
+# This is here to keep pre-commit-ci from going ape and running on the content
+# of this folder.
+enable: false
diff --git a/miss_hit.cfg b/miss_hit.cfg
@@ -1,13 +1,14 @@
 # style guide (https://florianschanda.github.io/miss_hit/style_checker.html)
 line_length: 100
 regex_function_name: "[a-z]+(([A-Z]){1}[A-Za-z]+)*"
+regex_script_name: "[a-z]+(([A-Z]){1}[A-Za-z]+)*"
 exclude_dir: "lib"
 copyright_entity: "Mohamed Rezk"
-copyright_entity: "Agah Karakuzu" 
+copyright_entity: "Agah Karakuzu"
 copyright_entity: "CPP visual motion localizer developpers"
 
 # metrics limit for the code quality (https://florianschanda.github.io/miss_hit/metrics.html)
 metric "cnest": limit 4
 metric "file_length": limit 500
 metric "cyc": limit 15
-metric "parameters": limit 5
+metric "parameters": limit 7
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,2 @@
+miss_hit==0.9.22
+pre-commit
diff --git a/setParameters.m b/setParameters.m
@@ -11,7 +11,7 @@
     % setParamters.m file is
     % change that if you want the data to be saved somewhere else
     cfg.dir.output = fullfile( ...
-                              fileparts(mfilename('fullpath')),'output');
+                              fileparts(mfilename('fullpath')), 'output');
 
     %% Debug mode settings
 
@@ -136,7 +136,7 @@
     % target
     cfg.target.maxNbPerBlock = 1;
     cfg.target.duration = 0.1; % In secs
-    cfg.target.type = 'fixation_cross';  
+    cfg.target.type = 'fixation_cross';
     % 'fixation_cross' : the fixation cross changes color
     % 'static_repeat' : dots are in the same position
 
diff --git a/subfun/doDotMo.m b/subfun/doDotMo.m
@@ -18,8 +18,8 @@
     % We then draw an aperture on top to hide the certain dots.
 
     %% Get parameters
-    if ~(strcmp(thisEvent.trial_type, 'static') && thisEvent.target == 1) ...
-        || isempty(dots)
+    if ~(strcmp(thisEvent.trial_type, 'static') && thisEvent.target == 1) ||  ...
+        isempty(dots)
         dots = initDots(cfg, thisEvent);
     end
 
diff --git a/tests/README.md b/tests/README.md
@@ -2,4 +2,4 @@
 
 To be run using mox unit.
 
-Code coverage can be estimated with Mocov.
+Code coverage can be estimated with Mocov.
diff --git a/tests/miss_hit.cfg b/tests/miss_hit.cfg
@@ -7,4 +7,4 @@ suppress_rule: "copyright_notice"
 metric "cnest": limit 4
 metric "file_length": limit 500
 metric "cyc": limit 15
-metric "parameters": limit 5
+metric "parameters": limit 5
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v0.0.1
+v0.0.1
diff --git a/visualMotionLocalizer.m b/visualMotionLocalizer.m
@@ -77,7 +77,7 @@
         fprintf('\n - Running Block %.0f \n', iBlock);
 
         eyeTracker('Message', cfg, ['start_block-', num2str(iBlock)]);
-        dots=[];
+        dots = [];
         previousEvent.target = 0;
         % For each event in the block
         for iEvent = 1:cfg.design.nbEventsPerBlock
@@ -106,7 +106,7 @@
             else
                 dots = [];
             end
-                
+
             % play the dots and collect onset and duraton of the event
             [onset, duration, dots] = doDotMo(cfg, thisEvent, thisFixation, dots);
 
@@ -130,8 +130,8 @@
             eyeTracker('Message', cfg, ...
                        ['end_trial-', num2str(iEvent), '_', thisEvent.trial_type]);
 
-                   previousEvent = thisEvent;
-                   
+            previousEvent = thisEvent;
+
             waitFor(cfg, cfg.timing.ISI);
 
         end

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-# External libraries and dependencies`
	`1`	`+# External libraries and dependencies`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# This is here to keep pre-commit-ci from going ape and running on the content`
	`2`	`+# of this folder.`
	`3`	`+enable: false`