Merge pull request #93 from jmtyszka/Development

Development

Author: jmtyszka

README.md

@@ -1,6 +1,6 @@
 # BIDSKIT
 
-### Version 2022.2.1
+### Version 2022.2.10
 Python utilities for converting from DICOM to BIDS neuroimaging formats.
 
 The *bidskit* console command takes a directory tree containing imaging series from one or more subjects (eg T1w MPRAGE, BOLD EPI, Fieldmaps), converts the imaging data to Nifti-1 format with JSON metadata files (sidecars) and populates a directory tree according to the latest BIDS specification.

bidskit/translate.py

@@ -608,15 +608,15 @@ def handle_fmap_case(work_json_fname, bids_nii_fname, bids_json_fname):
                 te1 = e1m_info['EchoTime']
                 te2 = e2p_info['EchoTime']
 
-                print('  GRE TE1 : {} ms'.format(te1))
-                print('  GRE TE2 : {} ms'.format(te2))
-                print('  GRE dTE : {} ms'.format(te2 - te1))
+                print(f'      GRE TE1 : {te1:0.5f} ms')
+                print(f'      GRE TE2 : {te2:0.5f} ms')
+                print(f'      GRE dTE : {(te2-te1):0.5f} ms')
 
                 e2p_info['EchoTime1'] = te1
                 e2p_info['EchoTime2'] = te2
 
                 # Re-write echo 2 phase JSON sidecar
-                print('Updating Echo 2 Phase JSON sidecar')
+                print('    Updating Echo 2 Phase JSON sidecar')
                 write_json(e2p_fname, e2p_info, overwrite=True)
 
             else:

setup.py

@@ -45,7 +45,7 @@
     # For a discussion on single-sourcing the version across setup.py and the
     # project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='2022.2.1',  # Required
+    version='2022.2.10',  # Required
 
     # This is a one-line description or tagline of what your project does. This
     # corresponds to the "Summary" metadata field:
@@ -109,8 +109,8 @@
         # that you indicate whether you support Python 2, Python 3 or both.
         # These classifiers are *not* checked by 'pip install'. See instead
         # 'python_requires' below.
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
 
     # This field adds keywords for your project which will appear on the
@@ -135,17 +135,17 @@
     # and refuse to install the project if the version does not match. If you
     # do not support Python 2, you can simplify this to '>=3.5' or similar, see
     # https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires
-    python_requires='>=3.6, <4',
+    python_requires='>=3.8, <4',
 
     # This field lists other packages that your project depends on to run.
     # Any package you put here will be installed by pip when your project is
     # installed, so they must be valid existing projects.
     #
     # For an analysis of "install_requires" vs pip's requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=['pydicom>=1.2.2',
+    install_requires=['pydicom>=2.2',
                       'pybids>=0.13',
-                      'numpy'],
+                      'numpy>=1.21'],
 
     # List additional groups of dependencies here (e.g. development
     # dependencies). Users will be able to install these using the "extras"