Merge pull request #3019 from stilley2/remove_versioning

Remove versioning from loadpkl

Author: effigies

nipype/utils/filemanip.py

@@ -670,12 +670,12 @@ def load_json(filename):
 
 def loadcrash(infile, *args):
     if infile.endswith('pkl') or infile.endswith('pklz'):
-        return loadpkl(infile, versioning=True)
+        return loadpkl(infile)
     else:
         raise ValueError('Only pickled crashfiles are supported')
 
 
-def loadpkl(infile, versioning=False):
+def loadpkl(infile):
     """Load a zipped or plain cPickled file."""
     infile = Path(infile)
     fmlogger.debug('Loading pkl: %s', infile)
@@ -700,9 +700,6 @@ def loadpkl(infile, versioning=False):
             fmlogger.info('Successfully loaded pkl in compatibility mode.')
         # Unpickling problems
         except Exception as e:
-            if not versioning:
-                raise e
-
             if pkl_metadata and 'version' in pkl_metadata:
                 from nipype import __version__ as version
                 if pkl_metadata['version'] != version:

nipype/utils/tests/test_filemanip.py

@@ -558,7 +558,7 @@ def test_versioned_pklization(tmpdir):
         with mock.patch('nipype.utils.tests.test_filemanip.Pickled', PickledBreaker), \
              mock.patch('nipype.__version__', '0.0.0'):
 
-            loadpkl('./pickled.pkz', versioning=True)
+            loadpkl('./pickled.pkz')
 
 
 def test_unversioned_pklization(tmpdir):
@@ -569,7 +569,7 @@ def test_unversioned_pklization(tmpdir):
 
     with pytest.raises(Exception):
         with mock.patch('nipype.utils.tests.test_filemanip.Pickled', PickledBreaker):
-            loadpkl('./pickled.pkz', versioning=True)
+            loadpkl('./pickled.pkz')
 
 
 def test_Path_strict_resolve(tmpdir):
@@ -589,11 +589,10 @@ def test_Path_strict_resolve(tmpdir):
     assert '%s/somefile.txt' % tmpdir == '%s' % testfile.resolve(strict=True)
 
 
-@pytest.mark.parametrize("load_versioning", [True, False])
 @pytest.mark.parametrize("save_versioning", [True, False])
-def test_pickle(tmp_path, save_versioning, load_versioning):
+def test_pickle(tmp_path, save_versioning):
     testobj = 'iamateststr'
     pickle_fname = str(tmp_path / 'testpickle.pklz')
     savepkl(pickle_fname, testobj, versioning=save_versioning)
-    outobj = loadpkl(pickle_fname, versioning=load_versioning)
+    outobj = loadpkl(pickle_fname)
     assert outobj == testobj