Skip to content

Commit

Permalink
Bump Pandas Version (#317)
Browse files Browse the repository at this point in the history
* bumped pandas to a minimum version not a singular one
* fix spelling errors to appease codespell
  • Loading branch information
bendhouseart authored Aug 12, 2024
1 parent f6e221b commit ba2557a
Show file tree
Hide file tree
Showing 8 changed files with 126 additions and 97 deletions.
2 changes: 1 addition & 1 deletion ecat_validation/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,4 @@ pip install pypet2bids
ecatpet2bids ECAT7_multiframe.v.gz --convert
```

This illustrates [what metadata are extracted from the ecat file](https://github.com/openneuropet/PET2BIDS/blob/main/ecat_validation/ECAT7_multiframe.json) - which does not comform with BIDS because radiochemistry and pharmaceutical metadata are missing.
This illustrates [what metadata are extracted from the ecat file](https://github.com/openneuropet/PET2BIDS/blob/main/ecat_validation/ECAT7_multiframe.json) - which does not conform with BIDS because radiochemistry and pharmaceutical metadata are missing.
4 changes: 2 additions & 2 deletions matlab/dcm2niix4pet.m
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function dcm2niix4pet(FolderList,MetaList,varargin)
% - *p* = 'y'; % Philips precise float (not display) scaling (y/n, default y)
% - *v* = 1; % verbose (n/y or 0/1/2, default 0) [no, yes, logorrheic]
% - *w* = 2; % write behavior for name conflicts (0,1,2, default 2: 0=skip duplicates, 1=overwrite, 2=add suffix)
% - *x* = 'n'; % crop 3D acquisitions (y/n/i, default n, use 'i'gnore to neither crop nor rotate 3D acquistions)
% - *x* = 'n'; % crop 3D acquisitions (y/n/i, default n, use 'i'gnore to neither crop nor rotate 3D acquisitions)
% - *z* = 'n'; % gz compress images (y/o/i/n/3, default y) [y=pigz, o=optimal pigz, i=internal:miniz, n=no, 3=no,3D]
%
% .. code-block::
Expand Down Expand Up @@ -91,7 +91,7 @@ function dcm2niix4pet(FolderList,MetaList,varargin)
p = 'y'; % Philips precise float (not display) scaling (y/n, default y)
v = 1; % verbose (n/y or 0/1/2, default 0) [no, yes, logorrheic]
w = 2; % write behavior for name conflicts (0,1,2, default 2: 0=skip duplicates, 1=overwrite, 2=add suffix)
x = 'n'; % crop 3D acquisitions (y/n/i, default n, use 'i'gnore to neither crop nor rotate 3D acquistions)
x = 'n'; % crop 3D acquisitions (y/n/i, default n, use 'i'gnore to neither crop nor rotate 3D acquisitions)
z = 'y'; % gz compress images (y/o/i/n/3, default y) [y=pigz, o=optimal pigz, i=internal:miniz, n=no, 3=no,3D]

%% check dcm2nii inputs
Expand Down
205 changes: 117 additions & 88 deletions pypet2bids/poetry.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pypet2bids/pypet2bids/ecat_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ def cli():
help="Update/create a json sidecar file from an ECAT given a path to that each "
"file,. e.g."
"ecatpet2bids ecatfile.v --update path/to/sidecar.json "
"additionally one can pass metadat to the sidecar via inclusion of the "
"additionally one can pass metadata to the sidecar via inclusion of the "
"--kwargs flag or"
"the --metadata-path flag. If both are included the --kwargs flag will "
"override any"
Expand All @@ -201,7 +201,7 @@ def cli():
into the output from ecatpet2bids. Additional arguments/fields are passed via the kwargs flag
in key value pairs.
example 1 (Passing PET metadat via the --kwargs argument):
example 1 (Passing PET metadata via the --kwargs argument):
# Note `#` denotes a comment
Expand Down
2 changes: 1 addition & 1 deletion pypet2bids/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pydicom = "^2.2.2"
openpyxl = "^3.0.9"
xlrd = "^2.0.1"
json-maj = "^0.0.8"
pandas = "^1.4.4"
pandas = ">=1.4.4"
pyxlsb = "^1.0.9"
joblib = "^1.2.0"
toml = ">=0.10.2"
Expand Down
2 changes: 1 addition & 1 deletion spreadsheet_conversion/blood/pmod/convert_pmod_to_blood.m
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function convert_pmod_to_blood(varargin)

%% deal with input file
if nargin == 0
[filenames, pathnames] = uigetfile({'*.bld','speadsheet';'*.txt','text'}, 'Pick the pmod files (N=2 or 3)', 'multiselect','on');
[filenames, pathnames] = uigetfile({'*.bld','spreadsheet';'*.txt','text'}, 'Pick the pmod files (N=2 or 3)', 'multiselect','on');
if isequal(filenames, 0) || isequal(pathnames, 0)
disp('Selection cancelled');
return
Expand Down
2 changes: 1 addition & 1 deletion spreadsheet_conversion/many_subjects_sheet/README.mkd
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ From the 2nd row, values are entered. When multiple values are required, these a

# format

While the current templates and examples are in .xlsx (microsoft excel), other speadsheet formats can be used.
While the current templates and examples are in .xlsx (microsoft excel), other spreadsheet formats can be used.
2 changes: 1 addition & 1 deletion spreadsheet_conversion/single_subject_sheet/README.mkd
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ From the 2nd row, values are entered. When multiple values are required, these a

# format

While the current template and example are in .xlsx (microsoft excel), other speadsheet formats can be used.
While the current template and example are in .xlsx (microsoft excel), other spreadsheet formats can be used.

0 comments on commit ba2557a

Please sign in to comment.