dataverse-utils 0.22.3__tar.gz → 0.22.4__tar.gz

{dataverse_utils-0.22.3 → dataverse_utils-0.22.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataverse-utils
-Version: 0.22.3
+Version: 0.22.4
 Summary: Utilities for the Dataverse data respository system
 License: MIT
 License-File: LICENCE.md

{dataverse_utils-0.22.3 → dataverse_utils-0.22.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dataverse-utils"
-version = "0.22.3"
+version = "0.22.4"
 description = "Utilities for the Dataverse data respository system"
 authors = [
     {name = "Paul Lesack",email = "paul.lesack@ubc.ca"}

{dataverse_utils-0.22.3 → dataverse_utils-0.22.4}/src/dataverse_utils/__init__.py

@@ -7,7 +7,7 @@ import pathlib
 import sys
 from dataverse_utils.dataverse_utils import *
 
-VERSION = (0, 22, '3a1')
+VERSION = (0, 22, 4)
 __version__ = '.'.join([str(x) for x in VERSION])
 
 USERAGENT = (f'dataverse_utils/v{__version__} ({sys.platform.capitalize()}); '
@@ -15,7 +15,7 @@ USERAGENT = (f'dataverse_utils/v{__version__} ({sys.platform.capitalize()}); '
 UAHEADER = {'User-agent' : USERAGENT}
 
 SCRIPT_VERSIONS={
-'dv_collection_info' : (0, 1, 2),
+'dv_collection_info' : (0, 1, 3),
 'dv_del' : (0, 2, 4),
 'dv_ldc_uploader' : (0, 3, 0),
 'dv_list_files' : (0, 1, 1),

{dataverse_utils-0.22.3 → dataverse_utils-0.22.4}/src/dataverse_utils/collections.py

@@ -481,7 +481,11 @@ class StudyMetadata(dict):
                 filelist = self.extract_files(_.get('files', []))
                 for oldfile in filelist:
                     oldfile.update({k:v for k,v in _.items() if k in add_fields})
-                    vs = _.get('versionNumber', _.get('versionState', ''))
+                    try:
+                        vs = f'{_["versionNumber"]}.{_["versionMinorNumber"]}'
+                    except KeyError:
+                        vs = _.get('versionState', '')
+                    #vs = _.get('versionNumber', _.get('versionState', ''))
                     oldfile.update({'versionStatement' : vs})
                 all_files.extend(filelist)
             self.__all_files = all_files
@@ -744,7 +748,6 @@ class ReadmeCreator:
                         'File label', 'Filename']:
                 del fileout[rem]
             #not everyone has a pid for the file
-            #breakpoint()
             if not fileout.get('Persistent Identifier'):
                 del fileout['Persistent Identifier']
             # Should I only have remote material here? What about

{dataverse_utils-0.22.3 → dataverse_utils-0.22.4}/src/dataverse_utils/scripts/dv_collection_info.py

@@ -41,7 +41,7 @@ def parse() -> argparse.ArgumentParser():
                               'Default: title, author. for '
                               'study metadata and file label, id for file metadata' )),
                         nargs='*',
-                        default=['title', 'author', 'file_label', 'id'])
+                        default=['title', 'author', 'label', 'dataFile_id'])
     parser.add_argument('-o', '--output', help='Output file name.',
                        required=False)
     parser.add_argument('-i','--include-all-versions',
@@ -75,7 +75,6 @@ def fields(args:argparse.ArgumentParser, all_studies)->dict:
     '''
     Outputs appropriate header fields based on argparse values
     '''
-    #print(args)
     match (args.include_all_versions, args.files):
         case (0, 0):
             fieldnames = sorted(list(set(key for study in all_studies for key in study)))
@@ -220,7 +219,6 @@ def main():
 
     else:
         fieldnames =  args.fields[2:] if args.files else args.fields[:2]
-
     out = io.StringIO(newline='')
     writer = csv.DictWriter(out,
                             fieldnames=fieldnames,