# HG changeset patch # User rv43 # Date 1659028476 0 # Node ID 1c7f86ab84aafe4b95c6bf5d53ee2153adc03234 # Parent 5735b3d49897a666c99acbd910aa35600da2ab4c "planemo upload for repository https://github.com/rolfverberg/galaxytools commit d0260a00527c2d69ef0675b49c5d86730ec14303" diff -r 5735b3d49897 -r 1c7f86ab84aa tomo_setup.py --- a/tomo_setup.py Thu Jul 28 17:02:40 2022 +0000 +++ b/tomo_setup.py Thu Jul 28 17:14:36 2022 +0000 @@ -67,10 +67,15 @@ # Check input file type print(f'inputfiles ({type(args.inputfiles)}):\n{args.inputfiles}') print(f'inputfile_types ({type(args.inputfile_types)}):\n{args.inputfile_types}') - if isinstance(args.inputfile_types, str) and args.inputfile_types == 'collection': - input_as_collection = True - elif isinstance(args.inputfile_types, list): - input_as_collection = False + if isinstance(args.inputfile_types, list): + if args.inputfile_types[0] == 'collection': + input_as_collection = True + if len(args.inputfiles) != 1 or args.inputfiles[0] != inputfiles.txt: + raise ValueError('Inconsistent inputfiles and inputfile_types:\n'+ + f'inputfiles ({type(inputfiles)}):\n{inputfiles}\n'+ + f'inputfile_types ({type(inputfile_types)}):\n{inputfile_types}') + else: + input_as_collection = False else: raise ValueError(f'Invalid args.inputfile_types: {args.inputfile_types} '+ f'{type(args.inputfile_types)}')