From d682115544547e9a714fa1964fa0f24c87bb393c Mon Sep 17 00:00:00 2001 From: "Cheng, Tiejun" Date: Mon, 24 Feb 2025 14:29:01 -0500 Subject: [PATCH 1/2] fix error with dctap init (see https://github.com/dcmi/dctap/issues/111) --- dctap/cli.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dctap/cli.py b/dctap/cli.py index d169f5fc..ccfcdfcf 100755 --- a/dctap/cli.py +++ b/dctap/cli.py @@ -1,12 +1,14 @@ """DC Tabular Application Profiles (DCTAP) command-line utility.""" -import sys import json as j -from ruamel.yaml import YAML +import sys + import click -from dctap.defaults import CONFIGFILE +from ruamel.yaml import YAML + from dctap.config import get_config, write_configfile from dctap.csvreader import csvreader +from dctap.defaults import CONFIGFILE from dctap.inspect import pprint_tapshapes, print_warnings from dctap.loggers import stderr_logger from dctap.utils import expand_uri_prefixes @@ -40,10 +42,10 @@ def cli(context): @cli.command() @click.help_option(help="Show help and exit") @click.pass_context -def init(context, hidden): +def init(context): """Write config file: 'dctap.yaml'.""" configfile = CONFIGFILE - write_configfile(configfile) + write_configfile(default_configfile_name=configfile) @cli.command() @@ -88,9 +90,7 @@ def read(context, csvfile_obj, config, expand_prefixes, warnings, json, yaml): y.dump(tapshapes_dict, sys.stdout) if not (json or yaml): - pprint_output = pprint_tapshapes( - tapshapes_dict=tapshapes_dict, config_dict=config_dict - ) + pprint_output = pprint_tapshapes(tapshapes_dict=tapshapes_dict, config_dict=config_dict) for line in pprint_output: print(line, file=sys.stdout) if warnings: From 633006ec82fbeb06a327e51b87896c8262c707a5 Mon Sep 17 00:00:00 2001 From: Nishad Thalhath <1372136+nishad@users.noreply.github.com> Date: Wed, 19 Mar 2025 01:06:55 +0900 Subject: [PATCH 2/2] fix: rename cli.txt to cli.py --- dctap/{cli.txt => cli.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dctap/{cli.txt => cli.py} (100%) diff --git a/dctap/cli.txt b/dctap/cli.py similarity index 100% rename from dctap/cli.txt rename to dctap/cli.py