Blackify (#648)

* Blackify

* Add black to requirements

* Upgrade requirements

* Ues xenial distribution

Author: tomchristie

.travis.yml

@@ -1,13 +1,15 @@
+sudo: required
+dist: xenial
 language: python
 
 cache: pip
 
 python:
     - "3.6"
-    - "3.7-dev"
+    - "3.7"
 
 install:
-    - pip install -r requirements.txt
+    - pip install -U -r requirements.txt
 
 script:
     - scripts/lint

apistar/__init__.py

@@ -11,7 +11,15 @@
 from apistar.core import docs, parse, validate
 from apistar.document import Document, Field, Link, Section
 
-__version__ = '0.6.0'
+__version__ = "0.6.0"
 __all__ = [
-    'Client', 'Document', 'Section', 'Link', 'Field', 'cli', 'docs', 'parse', 'validate'
+    "Client",
+    "Document",
+    "Section",
+    "Link",
+    "Field",
+    "cli",
+    "docs",
+    "parse",
+    "validate",
 ]

apistar/cli.py

@@ -10,29 +10,23 @@
 import apistar
 from apistar.client import Client
 from apistar.client.debug import DebugSession
-from apistar.exceptions import (
-    ClientError, ErrorResponse, ParseError, ValidationError
-)
+from apistar.exceptions import ClientError, ErrorResponse, ParseError, ValidationError
 
 
 def _encoding_from_filename(filename):
     base, extension = os.path.splitext(filename)
-    return {
-        '.json': 'json',
-        '.yml': 'yaml',
-        '.yaml': 'yaml'
-    }.get(extension)
+    return {".json": "json", ".yml": "yaml", ".yaml": "yaml"}.get(extension)
 
 
 def _echo_error(exc, content, verbose=False):
     if verbose:
         # Verbose output style.
         lines = content.splitlines()
         for message in reversed(exc.messages):
-            error_str = ' ' * (message.position.column_no - 1)
-            error_str += '^ '
+            error_str = " " * (message.position.column_no - 1)
+            error_str += "^ "
             error_str += message.text
-            error_str = click.style(error_str, fg='red')
+            error_str = click.style(error_str, fg="red")
             lines.insert(message.position.line_no, error_str)
         for line in lines:
             click.echo(line)
@@ -42,20 +36,20 @@ def _echo_error(exc, content, verbose=False):
         # Compact output style.
         for message in exc.messages:
             pos = message.position
-            if message.code == 'required':
+            if message.code == "required":
                 index = message.index[:-1]
             else:
                 index = message.index
             if index:
-                fmt = '* %s (At %s, line %d, column %d.)'
+                fmt = "* %s (At %s, line %d, column %d.)"
                 output = fmt % (message.text, index, pos.line_no, pos.column_no)
                 click.echo(output)
             else:
-                fmt = '* %s (At line %d, column %d.)'
+                fmt = "* %s (At line %d, column %d.)"
                 output = fmt % (message.text, pos.line_no, pos.column_no)
                 click.echo(output)
 
-    click.echo(click.style('✘ ', fg='red') + exc.summary)
+    click.echo(click.style("✘ ", fg="red") + exc.summary)
 
 
 def _copy_tree(src, dst, verbose=False):
@@ -74,18 +68,18 @@ def _copy_tree(src, dst, verbose=False):
 
 
 def _load_config(options, verbose=False):
-    if not os.path.exists('apistar.yml'):
+    if not os.path.exists("apistar.yml"):
         # If the config file is not used, then --path is required.
-        if options['schema']['path'] is None:
+        if options["schema"]["path"] is None:
             raise click.UsageError('Missing option "--path".')
         config = options
 
     else:
-        with open('apistar.yml', 'rb') as config_file:
+        with open("apistar.yml", "rb") as config_file:
             content = config_file.read()
 
         try:
-            config = apistar.validate(content, format='config', encoding="yaml")
+            config = apistar.validate(content, format="config", encoding="yaml")
         except (ParseError, ValidationError) as exc:
             click.echo('Errors in configuration file "apistar.yml":')
             _echo_error(exc, content, verbose=verbose)
@@ -100,20 +94,20 @@ def _load_config(options, verbose=False):
                 if value is not None:
                     config[section][key] = value
 
-    path = config['schema']['path']
+    path = config["schema"]["path"]
     if not os.path.exists(path):
         raise click.UsageError('Schema file "%s" not found.' % path)
 
-    if config['schema']['encoding'] is None:
-        config['schema']['encoding'] = _encoding_from_filename(path)
+    if config["schema"]["encoding"] is None:
+        config["schema"]["encoding"] = _encoding_from_filename(path)
 
     return config
 
 
-FORMAT_SCHEMA_CHOICES = click.Choice(['openapi', 'swagger'])
-FORMAT_ALL_CHOICES = click.Choice(['config', 'jsonschema', 'openapi', 'swagger'])
-ENCODING_CHOICES = click.Choice(['json', 'yaml'])
-THEME_CHOICES = click.Choice(['apistar', 'redoc', 'swaggerui'])
+FORMAT_SCHEMA_CHOICES = click.Choice(["openapi", "swagger"])
+FORMAT_ALL_CHOICES = click.Choice(["config", "jsonschema", "openapi", "swagger"])
+ENCODING_CHOICES = click.Choice(["json", "yaml"])
+THEME_CHOICES = click.Choice(["apistar", "redoc", "swaggerui"])
 
 
 @click.group()
@@ -122,25 +116,19 @@ def cli():
 
 
 @click.command()
-@click.option('--path', type=click.Path(exists=True, dir_okay=False))
-@click.option('--format', type=FORMAT_ALL_CHOICES)
-@click.option('--encoding', type=ENCODING_CHOICES)
-@click.option('--verbose', '-v', is_flag=True, default=False)
+@click.option("--path", type=click.Path(exists=True, dir_okay=False))
+@click.option("--format", type=FORMAT_ALL_CHOICES)
+@click.option("--encoding", type=ENCODING_CHOICES)
+@click.option("--verbose", "-v", is_flag=True, default=False)
 def validate(path, format, encoding, verbose):
-    options = {
-        'schema': {
-            'path': path,
-            'format': format,
-            'encoding': encoding
-        }
-    }
+    options = {"schema": {"path": path, "format": format, "encoding": encoding}}
     config = _load_config(options, verbose=verbose)
 
-    path = config['schema']['path']
-    format = config['schema']['format']
-    encoding = config['schema']['encoding']
+    path = config["schema"]["path"]
+    format = config["schema"]["format"]
+    encoding = config["schema"]["encoding"]
 
-    with open(path, 'rb') as schema_file:
+    with open(path, "rb") as schema_file:
         content = schema_file.read()
 
     try:
@@ -150,56 +138,51 @@ def validate(path, format, encoding, verbose):
         sys.exit(1)
 
     success_summary = {
-        'json': 'Valid JSON',
-        'yaml': 'Valid YAML',
-        'config': 'Valid APIStar config.',
-        'jsonschema': 'Valid JSONSchema document.',
-        'openapi': 'Valid OpenAPI schema.',
-        'swagger': 'Valid Swagger schema.',
+        "json": "Valid JSON",
+        "yaml": "Valid YAML",
+        "config": "Valid APIStar config.",
+        "jsonschema": "Valid JSONSchema document.",
+        "openapi": "Valid OpenAPI schema.",
+        "swagger": "Valid Swagger schema.",
     }[format]
-    click.echo(click.style('✓ ', fg='green') + success_summary)
+    click.echo(click.style("✓ ", fg="green") + success_summary)
 
 
 @click.command()
-@click.option('--path', type=click.Path(exists=True, dir_okay=False))
-@click.option('--format', type=FORMAT_SCHEMA_CHOICES)
-@click.option('--encoding', type=ENCODING_CHOICES)
-@click.option('--output-dir', type=click.Path())
-@click.option('--theme', type=THEME_CHOICES)
-@click.option('--serve', is_flag=True, default=False)
-@click.option('--verbose', '-v', is_flag=True, default=False)
+@click.option("--path", type=click.Path(exists=True, dir_okay=False))
+@click.option("--format", type=FORMAT_SCHEMA_CHOICES)
+@click.option("--encoding", type=ENCODING_CHOICES)
+@click.option("--output-dir", type=click.Path())
+@click.option("--theme", type=THEME_CHOICES)
+@click.option("--serve", is_flag=True, default=False)
+@click.option("--verbose", "-v", is_flag=True, default=False)
 def docs(path, format, encoding, output_dir, theme, serve, verbose):
     options = {
-        'schema': {
-            'path': path,
-            'format': format,
-            'encoding': encoding,
-        },
-        'docs': {
-            'output_dir': output_dir,
-            'theme': theme,
-        }
+        "schema": {"path": path, "format": format, "encoding": encoding},
+        "docs": {"output_dir": output_dir, "theme": theme},
     }
     config = _load_config(options, verbose=verbose)
 
-    path = config['schema']['path']
-    format = config['schema']['format']
-    encoding = config['schema']['encoding']
-    output_dir = config['docs']['output_dir']
-    theme = config['docs']['theme']
+    path = config["schema"]["path"]
+    format = config["schema"]["format"]
+    encoding = config["schema"]["encoding"]
+    output_dir = config["docs"]["output_dir"]
+    theme = config["docs"]["theme"]
 
     if output_dir is None:
-        output_dir = 'build'
+        output_dir = "build"
     if theme is None:
-        theme = 'apistar'
+        theme = "apistar"
 
     schema_filename = os.path.basename(path)
-    schema_url = '/' + schema_filename
-    with open(path, 'rb') as schema_file:
+    schema_url = "/" + schema_filename
+    with open(path, "rb") as schema_file:
         content = schema_file.read()
 
     try:
-        index_html = apistar.docs(content, format=format, encoding=encoding, schema_url=schema_url)
+        index_html = apistar.docs(
+            content, format=format, encoding=encoding, schema_url=schema_url
+        )
     except (ParseError, ValidationError) as exc:
         _echo_error(exc, content, verbose=verbose)
         sys.exit(1)
@@ -208,10 +191,10 @@ def docs(path, format, encoding, output_dir, theme, serve, verbose):
         os.makedirs(output_dir)
 
     # Write 'index.html' to the docs.
-    output_path = os.path.join(output_dir, 'index.html')
+    output_path = os.path.join(output_dir, "index.html")
     if verbose:
         click.echo(output_path)
-    output_file = open(output_path, 'w')
+    output_file = open(output_path, "w")
     output_file.write(index_html)
     output_file.close()
 
@@ -223,7 +206,7 @@ def docs(path, format, encoding, output_dir, theme, serve, verbose):
 
     # Write static files to the docs.
     package_dir = os.path.dirname(apistar.__file__)
-    static_dir = os.path.join(package_dir, 'themes', theme, 'static')
+    static_dir = os.path.join(package_dir, "themes", theme, "static")
     _copy_tree(static_dir, output_dir, verbose=verbose)
 
     # All done.
@@ -234,39 +217,33 @@ def docs(path, format, encoding, output_dir, theme, serve, verbose):
         socketserver.TCPServer.allow_reuse_address = True
         with socketserver.TCPServer(addr, handler) as httpd:
             msg = 'Documentation available at "http://127.0.0.1:8000/" (Ctrl+C to quit)'
-            click.echo(click.style('✓ ', fg='green') + msg)
+            click.echo(click.style("✓ ", fg="green") + msg)
             httpd.serve_forever()
     else:
         msg = 'Documentation built at "%s".'
-        click.echo(click.style('✓ ', fg='green') + (msg % output_path))
+        click.echo(click.style("✓ ", fg="green") + (msg % output_path))
 
 
 @click.command()
-@click.argument('operation')
-@click.argument('params', nargs=-1)
-@click.option('--path', type=click.Path(exists=True, dir_okay=False))
-@click.option('--format', type=FORMAT_SCHEMA_CHOICES)
-@click.option('--encoding', type=ENCODING_CHOICES)
-@click.option('--verbose', '-v', is_flag=True, default=False)
+@click.argument("operation")
+@click.argument("params", nargs=-1)
+@click.option("--path", type=click.Path(exists=True, dir_okay=False))
+@click.option("--format", type=FORMAT_SCHEMA_CHOICES)
+@click.option("--encoding", type=ENCODING_CHOICES)
+@click.option("--verbose", "-v", is_flag=True, default=False)
 @click.pass_context
 def request(ctx, operation, params, path, format, encoding, verbose):
-    options = {
-        'schema': {
-            'path': path,
-            'format': format,
-            'encoding': encoding
-        }
-    }
+    options = {"schema": {"path": path, "format": format, "encoding": encoding}}
     config = _load_config(options, verbose=verbose)
 
-    path = config['schema']['path']
-    format = config['schema']['format']
-    encoding = config['schema']['encoding']
+    path = config["schema"]["path"]
+    format = config["schema"]["format"]
+    encoding = config["schema"]["encoding"]
 
-    with open(path, 'rb') as schema_file:
+    with open(path, "rb") as schema_file:
         schema = schema_file.read()
 
-    params = [param.partition('=') for param in params]
+    params = [param.partition("=") for param in params]
     params = dict([(key, value) for key, sep, value in params])
 
     session = ctx.obj
@@ -284,18 +261,18 @@ def request(ctx, operation, params, path, format, encoding, verbose):
         result = client.request(operation, **params)
     except ClientError as exc:
         for message in exc.messages:
-            if message.code == 'invalid_property':
+            if message.code == "invalid_property":
                 text = '* Invalid parameter "%s".' % message.index[0]
-            elif message.code == 'required':
+            elif message.code == "required":
                 text = '* Missing required parameter "%s".' % message.index[0]
             else:
-                text = '* %s' % message.text
+                text = "* %s" % message.text
             click.echo(text)
-        click.echo(click.style('✘ ', fg='red') + 'Client error')
+        click.echo(click.style("✘ ", fg="red") + "Client error")
         sys.exit(1)
     except ErrorResponse as exc:
         click.echo(json.dumps(exc.content, indent=4))
-        click.echo(click.style('✘ ', fg='red') + exc.title)
+        click.echo(click.style("✘ ", fg="red") + exc.title)
         sys.exit(1)
     click.echo(json.dumps(result, indent=4))
 

apistar/client/__init__.py

@@ -1,5 +1,3 @@
 from apistar.client.client import Client
 
-__all__ = [
-    'Client'
-]
+__all__ = ["Client"]