dataverse-utils 0.26.1__tar.gz → 0.26.2__tar.gz

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/PKG-INFO

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

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/pyproject.toml

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

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/__init__.py

@@ -7,7 +7,7 @@ import pathlib
 import sys
 from dataverse_utils.dataverse_utils import *
 
-VERSION = (0, 26, 1)
+VERSION = (0, 26, 2)
 __version__ = '.'.join([str(x) for x in VERSION])
 
 USERAGENT = (f'dataverse_utils/v{__version__} ({sys.platform.capitalize()}); '
@@ -15,21 +15,21 @@ USERAGENT = (f'dataverse_utils/v{__version__} ({sys.platform.capitalize()}); '
 UAHEADER = {'User-agent' : USERAGENT}
 
 SCRIPT_VERSIONS={
-'dv_bagit' : (0, 1, 0),
-'dv_bulk_release' : (0, 1, 0),
-'dv_collection_info' : (0, 6, 0),
-'dv_del' : (0, 2, 4),
-'dv_ldc_uploader' : (0, 4, 1),
-'dv_list_files' : (0, 1, 1),
-'dv_manifest_gen' : (0, 5, 1),
-'dv_pg_facet_date' : (0, 1, 1),
-'dv_record_copy' : (0, 1, 2),
-'dv_release' : (0, 1, 3),
-'dv_replace_licence' : (0, 1, 1),
-'dv_readme_creator' : (0, 1, 1),
-'dv_study_migrator' : (0, 5, 0),
-'dv_tree' : (0, 2, 0),
-'dv_upload_tsv' : (0, 5, 0)}
+'dv_bagit' : (0, 1, 1),
+'dv_bulk_release' : (0, 1, 1),
+'dv_collection_info' : (0, 6, 1),
+'dv_del' : (0, 2, 5),
+'dv_ldc_uploader' : (0, 4, 2),
+'dv_list_files' : (0, 1, 2),
+'dv_manifest_gen' : (0, 5, 2),
+'dv_pg_facet_date' : (0, 1, 2),
+'dv_record_copy' : (0, 1, 3),
+'dv_release' : (0, 1, 4),
+'dv_replace_licence' : (0, 1, 2),
+'dv_readme_creator' : (0, 1, 2),
+'dv_study_migrator' : (0, 5, 1),
+'dv_tree' : (0, 2, 1),
+'dv_upload_tsv' : (0, 5, 1)}
 
 def script_ver_stmt(name:str)->str:
     '''

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/scripts/dv_bagit.py

@@ -55,11 +55,11 @@ def parse()->argparse.ArgumentParser:
                         nargs='+')
     return parser
 
-def main():
+def main(par=None):
     '''
     Create a bag
     '''
-    args = parse().parse_args()
+    args = parse().parse_args() if not par else par().parse_args()
     for pid in tqdm.tqdm(args.pids,
                          desc='Studies',
                          unit='study',

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/scripts/dv_bulk_release.py

@@ -137,11 +137,11 @@ def make_header(key:str)->dict:
     out.update(dataverse_utils.UAHEADER)
     return out
 
-def main():
+def main(par:argparse.ArgumentParser=None):
     '''
     Command line bulk deleter
     '''
-    args = parsley().parse_args()
+    args = parsley().parse_args() if not par else par().parse_args()
     args.majmin = args.majmin.lower()
     args.dvurl = args.dvurl.strip('/')
 

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/scripts/dv_collection_info.py

@@ -641,12 +641,12 @@ def clean_filename(args):
         instr = instr[:-len(suff)]
     return instr
 
-def main():
+def main(par:argparse.ArgumentParser=None):
     '''
     Replacement
     '''
     #pylint: disable=too-many-branches, too-many-locals, too-many-statements
-    args = parse().parse_args()
+    args = parse().parse_args() if not par else par().parse_args()
     logger = logme(args)
     args.output = clean_filename(args)
     dbase_file = pathlib.Path(args.output+extension(args)).expanduser()\

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/scripts/dv_del.py

@@ -108,11 +108,11 @@ def make_header(key:str)->dict:
     out.update(dataverse_utils.UAHEADER)
     return out
 
-def main():
+def main(par:argparse.ArgumentParser=None):
     '''
     Command line bulk deleter
     '''
-    args = parsley().parse_args()
+    args = parsley().parse_args() if not par else par().parse_args()
     args.dvurl = args.dvurl.strip('/')
 
     if args.dataverse:

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/scripts/dv_ldc_uploader.py

@@ -96,12 +96,11 @@ def upload_meta(ldccat: str, url: str, key: str,#pylint: disable = too-many-argu
     info = stud.upload_metadata(url=url, key=key, dv=dvs)
     return info['data']['persistentId']
 
-def main() -> None:
+def main(par:argparse.ArgumentParser=None) -> None:
     '''
     Uploads metadata and data to Dataverse collection/study respectively
     '''
-    parser = parse()
-    args = parser.parse_args()
+    args = parse().parse_args() if not par else par().parse_args()
     dc_config = dc.Config()
     contact_info={'dv_contact_name' : args.cname,
                   'dv_contact_email' : args.email}

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/scripts/dv_list_files.py

@@ -50,13 +50,13 @@ def parse() -> argparse.ArgumentParser():
                         help='Show version number and exit')
     return parser
 
-def main()->None:
+def main(par:argparse.ArgumentParser=None)->None:
     '''
     The primary function
     '''
     sepchar = {'tsv' : '\t',
                'csv' : ','}
-    args = parse().parse_args()
+    args = parse().parse_args() if not par else par().parse_args()
     if not args.url.lower().startswith('http'):
         args.url = f'https://{args.url}'
     output = io.StringIO(newline='')

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/scripts/dv_manifest_gen.py

@@ -93,12 +93,12 @@ def quotype(quote: str)-> int:
             'none' : 3}
     return vals.get(quote.lower(), -1)
 
-def main() -> None:
+def main(par:argparse.ArgumentParser=None) -> None:
     '''
     The main function call
     '''
-    parser = parse()
-    args = parser.parse_args()
+    parser = par.parse() if par else parse()
+    args = parse().parse_args() if not par else par().parse_args()
     args.quote = quotype(args.quote)
     if  args.quote == -1:
         parser.error('Invalid quotation type')

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/scripts/dv_pg_facet_date.py

@@ -206,12 +206,11 @@ def reindex(pid) -> dict:
     reind = requests.get(req, timeout=30)
     return reind.json()
 
-def main():
+def main(par:argparse.ArgumentParser=None):
     '''
     The heart of the application
     '''
-    parser = parsely()
-    args = parser.parse_args()
+    args = parsely().parse_args() if not par else par().parse_args()
     args.url = args.url.strip(' /')
     #import sys
     #print(args)

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/scripts/dv_readme_creator.py

@@ -75,11 +75,11 @@ def valid_outfile(infil:str)->bool:
         return False
     return whar.parent.expanduser().absolute().exists()
 
-def main():
+def main(par:argparse.ArgumentParser=None):
     '''
     You know what this is
     '''
-    args = parse().parse_args()
+    args = parse().parse_args() if not par else par().parse_args()
 
     verify = {args.pid: (valid_pid,
                          'Invalid PID. PIDs begin with hdl: or doi: '

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/scripts/dv_record_copy.py

@@ -95,12 +95,11 @@ def _output_json(injson : dict)->dict:
                                  }
               }
 
-def main():
+def main(par:argparse.ArgumentParser=None):
     '''
     You know what this does
     '''
-    parser = parsley()
-    args = parser.parse_args()
+    args = parsley().parse_args() if not par else par().parse_args()
     args.url = args.url.strip('/ ')
     record = _download_original(args.url, args.pid, args.key)
     if args.collection:

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/scripts/dv_release.py

@@ -198,13 +198,12 @@ class Study():
         if self.verbose:
             print(f'Released: {self.dvurl}/dataset.xhtml?persistentId={self.pid}')
 
-def main():
+def main(par:argparse.ArgumentParser=None):
     '''
     The primary function. Will release all unreleased studies in the
     the target Dataverse collection, or selected studies as required.
     '''
-    parser = argp()
-    args = parser.parse_args()
+    args = argp().parse_args() if not par else par().parse_args()
     if args.dv:
         the_dv = Dverse(args.url, args.key, args.dv)
         un_rel = the_dv.unreleased()

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/scripts/dv_replace_licence.py

@@ -115,12 +115,11 @@ def print_stat(rjson):
     print(rjson.get('data',''))
     print(rjson.get('message',''))
 
-def main():
+def main(par:argparse.ArgumentParser=None):
     '''
     Main script function
     '''
-    parse = parsley()
-    args = parse.parse_args()
+    args = parsley().parse_args() if not par else par().parse_args()
     args.url = args.url.strip('/ ')
     with open(args.lic, encoding='utf-8') as fil:
         newlic = fil.read()

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/scripts/dv_study_migrator.py

@@ -182,11 +182,11 @@ def remove_target_files(record:dataverse_utils.dvdata.Study, timeout:int=100, lo
                   file = sys.stderr)
             sys.exit()
 
-def main():
+def main(par:argparse.ArgumentParser=None):
     '''
     Run this, obviously
     '''
-    args = parsley().parse_args()
+    args = parsley().parse_args() if not par else par().parse_args()
     args.source_url = args.source_url.strip('/ ')
     args.target_url = args.target_url.strip('/ ')
     target_headers={'X-Dataverse-key': args.target_key}

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/scripts/dv_tree.py

@@ -42,11 +42,11 @@ def parse()->argparse.ArgumentParser:
 
     return parser
 
-def main():
+def main(par:argparse.ArgumentParser=None):
     '''
     Obviously
     '''
-    args = parse().parse_args()
+    args = parse().parse_args() if not par else par().parse_args()
     if not args.collection:
         sys.exit()
     try:

{dataverse_utils-0.26.1 → dataverse_utils-0.26.2}/src/dataverse_utils/scripts/dv_upload_tsv.py

@@ -78,12 +78,11 @@ def parse() -> argparse.ArgumentParser():
                         help='Show version number and exit')
     return parser
 
-def main() -> None:
+def main(par:argparse.ArgumentParser=None) -> None:
     '''
     Uploads data to an already existing Dataverse study
     '''
-    parser = parse()
-    args = parser.parse_args()
+    args = parse().parse_args() if not par else par().parse_args()
     if not args.nc and not args.rest:
         conf = input('File(s) will be unrestricted. Continue (y/n)? ')
         if conf.lower() == 'n' or conf.lower() == 'no':