Migrate to 'black' for consistent styling and formatting (#218)

* Migrate to 'black' for consistent styling and formatting

* Add black to tox and travis

Author: BeyondEvil

.gitignore

@@ -31,4 +31,4 @@ local.properties
 ##Tests JS
 node_modules/
 
-Pipfile
+Pipfile.lock

.travis.yml

@@ -1,50 +1,68 @@
 language: python
 jobs:
   include:
-    - stage:
+    - stage: tests
       language: node_js
       node_js: node
       install: npm install phantomjs-prebuilt@2.1.15 grunt-cli grunt grunt-contrib-qunit
       script: grunt test
-    - stage:
+
+    -
       python: 3.7
       dist: xenial
       sudo: required
       env: TOXENV=flake8
-    - stage:
+
+    -
+      python: 3.7
+      dist: xenial
+      sudo: required
+      env: TOXENV=black
+
+    -
       python: 2.7
       env: TOXENV=py27
-    - stage:
+
+    -
       python: 2.7
       env: TOXENV=py27-ansi2html
-    - stage:
+
+    -
       python: 3.6
       env: TOXENV=py36
-    - stage:
+
+    -
       python: 3.6
       env: TOXENV=py36-ansi2html
-    - stage:
+
+    -
       python: 3.7
       dist: xenial
       sudo: required
       env: TOXENV=py37
-    - stage:
+
+    -
       python: 3.7
       dist: xenial
       sudo: required
       env: TOXENV=py37-ansi2html
-    - stage:
+
+    -
       python: pypy
       env: TOXENV=pypy
-    - stage:
+
+    -
       python: pypy
       env: TOXENV=pypy-ansi2html
-    - stage:
+
+    -
       python: pypy3
       env: TOXENV=pypy3
-    - stage:
+
+    -
       python: pypy3
       env: TOXENV=pypy3-ansi2html
+
     - stage: deploy
       python: 3.7
       dist: xenial
@@ -60,7 +78,9 @@ jobs:
         on:
           tags: true
           repo: pytest-dev/pytest-html
-cache:
-  pip: true
+
+cache: pip
+
 install: pip install tox
+
 script: tox

Pipfile

@@ -0,0 +1,13 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+pytest = "*"
+tox = "*"
+flake8 = "*"
+black = "*"
+
+[packages]
+pytest-html = {editable = true,path = "."}

pytest_html/__init__.py

@@ -5,6 +5,6 @@
     __version__ = get_distribution(__name__).version
 except DistributionNotFound:
     # package is not installed
-    __version__ = 'unknown'
+    __version__ = "unknown"
 
-__pypi_url__ = 'https://pypi.python.org/pypi/pytest-html'
+__pypi_url__ = "https://pypi.python.org/pypi/pytest-html"

pytest_html/extras.py

@@ -2,45 +2,50 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-FORMAT_HTML = 'html'
-FORMAT_IMAGE = 'image'
-FORMAT_JSON = 'json'
-FORMAT_TEXT = 'text'
-FORMAT_URL = 'url'
+FORMAT_HTML = "html"
+FORMAT_IMAGE = "image"
+FORMAT_JSON = "json"
+FORMAT_TEXT = "text"
+FORMAT_URL = "url"
 
 
 def extra(content, format, name=None, mime_type=None, extension=None):
-    return {'name': name, 'format': format, 'content': content,
-            'mime_type': mime_type, 'extension': extension}
+    return {
+        "name": name,
+        "format": format,
+        "content": content,
+        "mime_type": mime_type,
+        "extension": extension,
+    }
 
 
 def html(content):
     return extra(content, FORMAT_HTML)
 
 
-def image(content, name='Image', mime_type='image/png', extension='png'):
+def image(content, name="Image", mime_type="image/png", extension="png"):
     return extra(content, FORMAT_IMAGE, name, mime_type, extension)
 
 
-def png(content, name='Image'):
-    return image(content, name, mime_type='image/png', extension='png')
+def png(content, name="Image"):
+    return image(content, name, mime_type="image/png", extension="png")
 
 
-def jpg(content, name='Image'):
-    return image(content, name, mime_type='image/jpeg', extension='jpg')
+def jpg(content, name="Image"):
+    return image(content, name, mime_type="image/jpeg", extension="jpg")
 
 
-def svg(content, name='Image'):
-    return image(content, name, mime_type='image/svg+xml', extension='svg')
+def svg(content, name="Image"):
+    return image(content, name, mime_type="image/svg+xml", extension="svg")
 
 
-def json(content, name='JSON'):
-    return extra(content, FORMAT_JSON, name, 'application/json', 'json')
+def json(content, name="JSON"):
+    return extra(content, FORMAT_JSON, name, "application/json", "json")
 
 
-def text(content, name='Text'):
-    return extra(content, FORMAT_TEXT, name, 'text/plain', 'txt')
+def text(content, name="Text"):
+    return extra(content, FORMAT_TEXT, name, "text/plain", "txt")
 
 
-def url(content, name='URL'):
+def url(content, name="URL"):
     return extra(content, FORMAT_URL, name)