Run black -S.

Author: pascalbauermeister

setup.py

@@ -39,9 +39,9 @@
  "test": ["coverage"],
  },
  package_data={
-# "umlsequence2": ["tbdpackage__data.dat"],
+ # "umlsequence2": ["tbdpackage__data.dat"],
  },
-# data_files=[('data_flow_diagram', ["VERSION"])],
+ # data_files=[('data_flow_diagram', ["VERSION"])],
  # The following would provide a command called `umlsequence2` which
  # executes the function `main` from this package when invoked:
  entry_points={
@@ -51,8 +51,8 @@
  },
  project_urls={
  "Bug Reports": "https://github.com/pbauermeister/umlsequence2/issues",
-# "Funding": "https://donate.pypi.org",
-# "Say Thanks!": "http://saythanks.io/to/example",
+ # "Funding": "https://donate.pypi.org",
+ # "Say Thanks!": "http://saythanks.io/to/example",
  "Source": "https://github.com/pbauermeister/umlsequence2",
  },
 )

src/umlsequence2/__init__.py

@@ -32,8 +32,9 @@
 VERSION = pkg_resources.require("umlsequence2")[0].version
 
 
-def generate_svg(input_fp: TextIO, output_path: str, percent_zoom: int,
- debug: bool, bgcolor: str) -> None:
+def generate_svg(
+ input_fp: TextIO, output_path: str, percent_zoom: int, debug: bool, bgcolor: str
+) -> None:
  cmds, raw = Parser(input_fp.read()).parse()
 
  if debug:
@@ -45,16 +46,27 @@ def generate_svg(input_fp: TextIO, output_path: str, percent_zoom: int,
  UmlBuilder(cmds, output_path, percent_zoom, bgcolor).run()
 
 
-def generate(input_fp: TextIO, output_path: str, percent_zoom: int,
- verbose: bool, debug: bool, bgcolor: str, format: str) -> None:
+def generate(
+ input_fp: TextIO,
+ output_path: str,
+ percent_zoom: int,
+ verbose: bool,
+ debug: bool,
+ bgcolor: str,
+ format: str,
+) -> None:
  if debug:
- print(dict(input=input_fp.name,
- output=output_path,
- percent_zoom=percent_zoom,
- debug=debug,
- bgcolor=bgcolor,
- format=format,
- ), file=sys.stderr)
+ print(
+ dict(
+ input=input_fp.name,
+ output=output_path,
+ percent_zoom=percent_zoom,
+ debug=debug,
+ bgcolor=bgcolor,
+ format=format,
+ ),
+ file=sys.stderr,
+ )
 
  if verbose:
  print(f'umlsequence2: generating file \'{output_path}\'', file=sys.stderr)
@@ -73,70 +85,88 @@ def parse_args() -> argparse.Namespace:
 
  parser = argparse.ArgumentParser(description=description, epilog=epilog)
 
- parser.add_argument('INPUT_FILE',
- action='store',
- default=None, nargs='?',
- help='UML sequence input file; '
- 'if omitted, stdin is used')
-
- parser.add_argument('--output-file', '-o',
- required=False,
- help='output file name; pass \'-\' to use stdout; '
- 'if omitted, use INPUT_FILE base name with \'.svg\' '
- 'extension, or stdout')
-
- parser.add_argument('--markdown', '-m',
- action='store_true',
- help='consider snippets between opening marker: '
- '```umlsequence OUTFILE, and closing marker: ```');
-
- parser.add_argument('--format', '-f',
- required=False,
- default='svg',
- help='output format: gif, jpg, tiff, bmp, pnm, eps, '
- 'pdf, svg (any supported by reportlab); default is svg')
-
- parser.add_argument('--percent-zoom', '-p',
- required=False,
- default=100, type=int,
- help='magnification percentage; default is 100')
-
- parser.add_argument('--background-color', '-b',
- required=False,
- default='white',
- help='background color name (including \'none\' for'
- ' transparent) in web color notation; see'
- ' https://developer.mozilla.org/en-US/docs/Web/CSS/color_value'
- ' for a list of valid names; default is white')
-
- parser.add_argument('--verbose',
- action='store_true',
- default=False,
- help='emits verbose messages')
-
- parser.add_argument('--debug',
- action='store_true',
- default=False,
- help='emits debug messages')
-
- parser.add_argument('--version', '-V',
- action='store_true',
- help='print the version and exit')
+ parser.add_argument(
+ 'INPUT_FILE',
+ action='store',
+ default=None,
+ nargs='?',
+ help='UML sequence input file; ' 'if omitted, stdin is used',
+ )
+
+ parser.add_argument(
+ '--output-file',
+ '-o',
+ required=False,
+ help='output file name; pass \'-\' to use stdout; '
+ 'if omitted, use INPUT_FILE base name with \'.svg\' '
+ 'extension, or stdout',
+ )
+
+ parser.add_argument(
+ '--markdown',
+ '-m',
+ action='store_true',
+ help='consider snippets between opening marker: '
+ '```umlsequence OUTFILE, and closing marker: ```',
+ )
+
+ parser.add_argument(
+ '--format',
+ '-f',
+ required=False,
+ default='svg',
+ help='output format: gif, jpg, tiff, bmp, pnm, eps, '
+ 'pdf, svg (any supported by reportlab); default is svg',
+ )
+
+ parser.add_argument(
+ '--percent-zoom',
+ '-p',
+ required=False,
+ default=100,
+ type=int,
+ help='magnification percentage; default is 100',
+ )
+
+ parser.add_argument(
+ '--background-color',
+ '-b',
+ required=False,
+ default='white',
+ help='background color name (including \'none\' for'
+ ' transparent) in web color notation; see'
+ ' https://developer.mozilla.org/en-US/docs/Web/CSS/color_value'
+ ' for a list of valid names; default is white',
+ )
+
+ parser.add_argument(
+ '--verbose', action='store_true', default=False, help='emits verbose messages'
+ )
+
+ parser.add_argument(
+ '--debug', action='store_true', default=False, help='emits debug messages'
+ )
+
+ parser.add_argument(
+ '--version', '-V', action='store_true', help='print the version and exit'
+ )
 
  # add config float values, e.g. COLUMN_WIDTH as --COLUMN-WIDTH
  cfg = get_config().__dict__
  conf_keys = [k for k, v in cfg.items() if isinstance(v, float)]
  for k in conf_keys:
- parser.add_argument('--' + k.replace('_', '-'),
- metavar='FLOAT', type=float,
- help=f'change {k} (default {cfg[k]})')
+ parser.add_argument(
+ '--' + k.replace('_', '-'),
+ metavar='FLOAT',
+ type=float,
+ help=f'change {k} (default {cfg[k]})',
+ )
 
  args = parser.parse_args()
  args.format = args.format.lower()
 
  # parse back config modifiers args
- conf_args = {k:args.__dict__[k] for k in conf_keys
- if args.__dict__[k] is not None}
+ conf_args = {k: args.__dict__[k] for k in conf_keys if args.__dict__[k] is not None}
  if conf_args:
  cfg.update(conf_args)
  set_config(model.Config(**cfg))
@@ -151,19 +181,26 @@ def run(args: argparse.Namespace) -> None:
  else:
  inp = open(args.INPUT_FILE)
 
-
  # markdown
  if args.markdown:
- rx = re.compile(r'^```\s*umlsequence\s+(?P<output>.*?)\s*'
- r'^(?P<src>.*?)^\s*```', re.DOTALL | re.M
+ rx = re.compile(
+ r'^```\s*umlsequence\s+(?P<output>.*?)\s*' r'^(?P<src>.*?)^\s*```',
+ re.DOTALL | re.M,
  )
  md = inp.read()
  for snippet in rx.finditer(md):
  inp = io.StringIO(snippet['src'])
  name = snippet['output']
  inp.name = name
- generate(inp, name, args.percent_zoom, args.debug, args.verbose,
- args.background_color, args.format)
+ generate(
+ inp,
+ name,
+ args.percent_zoom,
+ args.debug,
+ args.verbose,
+ args.background_color,
+ args.format,
+ )
  print(f'{sys.argv[0]}: generated {name}', file=sys.stderr)
  return
 
@@ -180,14 +217,28 @@ def run(args: argparse.Namespace) -> None:
  # output to stdout
  with tempfile.TemporaryDirectory() as d:
  path = os.path.join(d, 'file.svg')
- generate(inp, path, args.percent_zoom, args.debug, args.verbose,
- args.background_color, args.format)
+ generate(
+ inp,
+ path,
+ args.percent_zoom,
+ args.debug,
+ args.verbose,
+ args.background_color,
+ args.format,
+ )
  with open(path) as f:
  print(f.read())
  else:
  # output to file
- generate(inp, name, args.percent_zoom, args.debug, args.verbose,
- args.background_color, args.format)
+ generate(
+ inp,
+ name,
+ args.percent_zoom,
+ args.debug,
+ args.verbose,
+ args.background_color,
+ args.format,
+ )
 
 
 def main() -> None:

src/umlsequence2/config.py

@@ -9,37 +9,27 @@
 
 # Dimensions are in cm.
 _CONFIG = model.Config(
- ACTIVITY_WIDTH = 0.20,
-
- ACTOR_ASCENT = 0.25,
- ACTOR_DESCENT = 0.45,
- ACTOR_LABEL_Y = 0.90,
-
- ARROW_HEAD_SIZE = 0.30,
-
- COLOR_GREY = '#aaaaaa',
-
- COLUMN_SPACING = 0.25,
- COLUMN_WIDTH = 2.75,
-
- CROSS_SIZE = 0.50,
-
- MESSAGE_SPACING = 0.05,
-
- OBJECT_HEIGHT = 0.60,
- OBJECT_LABEL_Y = 0.40,
- OBJECT_STEP = 0.90,
-
- STEP_NORMAL = 0.60,
- STEP_SMALL = 0.30,
-
- TEXT_CHAR_WIDTH = 0.145,
- TEXT_DOGEAR = 0.20,
- TEXT_HEIGHT = 0.40,
- TEXT_FONT = dict(font_family='Helvetica, Arial, sans-serif',
- font_size='10px'),
- TEXT_MARGIN_X = 0.20,
- TEXT_MARGIN_Y = 0.15,
+ ACTIVITY_WIDTH=0.20,
+ ACTOR_ASCENT=0.25,
+ ACTOR_DESCENT=0.45,
+ ACTOR_LABEL_Y=0.90,
+ ARROW_HEAD_SIZE=0.30,
+ COLOR_GREY='#aaaaaa',
+ COLUMN_SPACING=0.25,
+ COLUMN_WIDTH=2.75,
+ CROSS_SIZE=0.50,
+ MESSAGE_SPACING=0.05,
+ OBJECT_HEIGHT=0.60,
+ OBJECT_LABEL_Y=0.40,
+ OBJECT_STEP=0.90,
+ STEP_NORMAL=0.60,
+ STEP_SMALL=0.30,
+ TEXT_CHAR_WIDTH=0.145,
+ TEXT_DOGEAR=0.20,
+ TEXT_HEIGHT=0.40,
+ TEXT_FONT=dict(font_family='Helvetica, Arial, sans-serif', font_size='10px'),
+ TEXT_MARGIN_X=0.20,
+ TEXT_MARGIN_Y=0.15,
 )
 
 

src/umlsequence2/error.py

@@ -1,5 +1,6 @@
 import sys
 
+
 def print_error(text: str) -> None:
  if sys.stderr.isatty():
  text = f'\033[31m{text}\033[0m'