Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/physiopy/phys2bids into s…
Browse files Browse the repository at this point in the history
…plit_utility
  • Loading branch information
sangfrois committed Apr 8, 2020
2 parents cd0c0a9 + 3dc8c8a commit 1d3c45b
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 12 deletions.
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!--(https://raw.githubusercontent.com/physiopy/phys2bids/master/docs/_static/phys2bids_card.jpg)-->
<a name="readme"></a>
<img alt="Phys2BIDS" src="https://github.com/physiopy/phys2bids/blob/master/docs/_static/phys2bids_logo1280×640.png" height="150">

Expand Down Expand Up @@ -36,6 +37,13 @@ Shortcuts:
- [**Contributor guide**](https://phys2bids.readthedocs.io/en/latest/contributorfile.html)
- [**Code of Conduct**](https://phys2bids.readthedocs.io/en/latest/conduct.html)

## The BrainWeb
BrainWeb participants, welcome!
We have a milestone [here](https://github.com/physiopy/phys2bids/milestone/5) as a collection of issues you could work on with our help.
Check the issues with a `BrainWeb` label. Of course, they are only suggestions, so feel free to tackle any issue you want, even open new ones!
You can also contact us on Gitter, in the BrainHack Mattermost (<a href="https://mattermost.brainhack.org/brainhack/channels/physiopy">#physiopy</a>), and don't hesitate to contact [Stefano](https://github.com/smoia) in other ways to jump in the development!


**The project is currently under development**.
Any suggestion/bug report is welcome! Feel free to open an issue.

Expand Down
Binary file added docs/_static/phys2bids_card.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions phys2bids/interfaces/txt.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"""

import logging
from collections import Counter
from operator import itemgetter

import numpy as np

from phys2bids.physio_obj import BlueprintInput
from operator import itemgetter
from collections import Counter

LGR = logging.getLogger(__name__)

Expand Down
6 changes: 3 additions & 3 deletions phys2bids/phys2bids.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
"""

import os
import logging
import datetime

import logging
from copy import deepcopy
from numpy import savetxt
from pathlib import Path

from numpy import savetxt

from phys2bids import utils, viz, _version
from phys2bids.cli.run import _get_parser
from phys2bids.physio_obj import BlueprintOutput
Expand Down
4 changes: 2 additions & 2 deletions phys2bids/tests/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
import json
import math
import os
from pkg_resources import resource_filename
import re
import subprocess
from pkg_resources import resource_filename

from phys2bids.phys2bids import phys2bids
from phys2bids._version import get_versions
from phys2bids.phys2bids import phys2bids


def check_string(str_container, str_to_find, str_expected, is_num=True):
Expand Down
5 changes: 3 additions & 2 deletions phys2bids/tests/test_phys2bids.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
Tests phys2bids.py
"""

import os
import json
from phys2bids import phys2bids
import os
from pkg_resources import resource_filename

from phys2bids import phys2bids


def test_print_summary(tmpdir):
test_filename = 'input.txt'
Expand Down
3 changes: 2 additions & 1 deletion phys2bids/tests/test_physio_obj.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
"""

import numpy as np
from phys2bids import physio_obj as po
from pytest import raises

from phys2bids import physio_obj as po


# Tests is_valid
def test_is_valid():
Expand Down
3 changes: 1 addition & 2 deletions phys2bids/utils.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-

import json
import logging
import os
import sys
import logging

from pathlib import Path

LGR = logging.getLogger(__name__)
Expand Down

0 comments on commit 1d3c45b

Please sign in to comment.