Apply pre-commit hooks.

akb · akb · commit 032f3f3832e3 · 2019-07-18T01:12:45.000Z
diff --git a/LICENSE b/LICENSE
@@ -6,4 +6,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/changelog.d/towncrier_template.rst b/changelog.d/towncrier_template.rst
@@ -34,4 +34,3 @@ No significant changes.
 {% endif %}
 {% endfor %}
 ----
-
diff --git a/ci/appveyor-bootstrap.py b/ci/appveyor-bootstrap.py
@@ -5,10 +5,12 @@
 with various fixes and improvements that just weren't feasible to implement in PowerShell.
 """
 from __future__ import print_function
+
 from os import environ
 from os.path import exists
 from subprocess import check_call
 
+
 try:
     from urllib.request import urlretrieve
 except ImportError:
@@ -29,10 +31,30 @@
 }
 INSTALL_CMD = {
     # Commands are allowed to fail only if they are not the last command.  Eg: uninstall (/x) allowed to fail.
-    "2.7": [["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"],
-            ["msiexec.exe", "/L*+!", "install.log", "/qn", "/i", "{path}", "TARGETDIR={home}"]],
-    "3.4": [["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"],
-            ["msiexec.exe", "/L*+!", "install.log", "/qn", "/i", "{path}", "TARGETDIR={home}"]],
+    "2.7": [
+        ["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"],
+        [
+            "msiexec.exe",
+            "/L*+!",
+            "install.log",
+            "/qn",
+            "/i",
+            "{path}",
+            "TARGETDIR={home}",
+        ],
+    ],
+    "3.4": [
+        ["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"],
+        [
+            "msiexec.exe",
+            "/L*+!",
+            "install.log",
+            "/qn",
+            "/i",
+            "{path}",
+            "TARGETDIR={home}",
+        ],
+    ],
     "3.5": [["{path}", "/quiet", "TargetDir={home}"]],
     "3.6": [["{path}", "/quiet", "TargetDir={home}"]],
 }
@@ -106,6 +128,14 @@ def install_packages(home, *packages):
 
 
 if __name__ == "__main__":
-    install_python(environ["PYTHON_VERSION"], environ["PYTHON_ARCH"], environ["PYTHON_HOME"])
+    install_python(
+        environ["PYTHON_VERSION"], environ["PYTHON_ARCH"], environ["PYTHON_HOME"]
+    )
     install_pip(environ["PYTHON_HOME"])
-    install_packages(environ["PYTHON_HOME"], "setuptools>=18.0.1", "wheel", "tox", "virtualenv>=13.1.0")
+    install_packages(
+        environ["PYTHON_HOME"],
+        "setuptools>=18.0.1",
+        "wheel",
+        "tox",
+        "virtualenv>=13.1.0",
+    )
diff --git a/ci/appveyor-download.py b/ci/appveyor-download.py
@@ -26,9 +26,7 @@ def make_auth_headers():
     with open(path) as f:
         token = f.read().strip()
 
-    headers = {
-        "Authorization": "Bearer {}".format(token),
-    }
+    headers = {"Authorization": "Bearer {}".format(token)}
     return headers
 
 
@@ -37,14 +35,20 @@ def download_latest_artifacts(account_project, build_id):
     if build_id is None:
         url = "https://ci.appveyor.com/api/projects/{}".format(account_project)
     else:
-        url = "https://ci.appveyor.com/api/projects/{}/build/{}".format(account_project, build_id)
+        url = "https://ci.appveyor.com/api/projects/{}/build/{}".format(
+            account_project, build_id
+        )
     build = requests.get(url, headers=make_auth_headers()).json()
     jobs = build["build"]["jobs"]
-    print(u"Build {0[build][version]}, {1} jobs: {0[build][message]}".format(build, len(jobs)))
+    print(
+        "Build {0[build][version]}, {1} jobs: {0[build][message]}".format(
+            build, len(jobs)
+        )
+    )
 
     for job in jobs:
         name = job["name"]
-        print(u"  {0}: {1[status]}, {1[artifactsCount]} artifacts".format(name, job))
+        print("  {0}: {1[status]}, {1[artifactsCount]} artifacts".format(name, job))
 
         url = "https://ci.appveyor.com/api/buildjobs/{}/artifacts".format(job["jobId"])
         response = requests.get(url, headers=make_auth_headers())
@@ -53,9 +57,11 @@ def download_latest_artifacts(account_project, build_id):
         for artifact in artifacts:
             is_zip = artifact["type"] == "Zip"
             filename = artifact["fileName"]
-            print(u"    {0}, {1} bytes".format(filename, artifact["size"]))
+            print("    {0}, {1} bytes".format(filename, artifact["size"]))
 
-            url = "https://ci.appveyor.com/api/buildjobs/{}/artifacts/{}".format(job["jobId"], filename)
+            url = "https://ci.appveyor.com/api/buildjobs/{}/artifacts/{}".format(
+                job["jobId"], filename
+            )
             download_url(url, filename, make_auth_headers())
 
             if is_zip:
@@ -79,28 +85,29 @@ def download_url(url, filename, headers):
             for chunk in response.iter_content(16 * 1024):
                 f.write(chunk)
     else:
-        print(u"    Error downloading {}: {}".format(url, response))
+        print("    Error downloading {}: {}".format(url, response))
 
 
 def unpack_zipfile(filename):
     """Unpack a zipfile, using the names in the zip."""
     with open(filename, "rb") as fzip:
         z = zipfile.ZipFile(fzip)
         for name in z.namelist():
-            print(u"      extracting {}".format(name))
+            print("      extracting {}".format(name))
             ensure_dirs(name)
             z.extract(name)
 
 
 parser = argparse.ArgumentParser(description="Download artifacts from AppVeyor.")
-parser.add_argument("--id",
-                    metavar="PROJECT_ID",
-                    default="python-mario/mario-addons",
-                    help="Project ID in AppVeyor.")
-parser.add_argument("build",
-                    nargs="?",
-                    metavar="BUILD_ID",
-                    help="Build ID in AppVeyor. Eg: master-123")
+parser.add_argument(
+    "--id",
+    metavar="PROJECT_ID",
+    default="python-mario/mario-addons",
+    help="Project ID in AppVeyor.",
+)
+parser.add_argument(
+    "build", nargs="?", metavar="BUILD_ID", help="Build ID in AppVeyor. Eg: master-123"
+)
 
 if __name__ == "__main__":
     # import logging
diff --git a/ci/bootstrap.py b/ci/bootstrap.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import unicode_literals
 
 import os
 import sys
@@ -41,15 +43,21 @@
         loader=jinja2.FileSystemLoader(join(base_path, "ci", "templates")),
         trim_blocks=True,
         lstrip_blocks=True,
-        keep_trailing_newline=True
+        keep_trailing_newline=True,
     )
 
     tox_environments = [
         line.strip()
         # WARNING: "tox" must be installed globally or in the project"s virtualenv
-        for line in subprocess.check_output(["tox", "--listenvs"], universal_newlines=True).splitlines()
+        for line in subprocess.check_output(
+            ["tox", "--listenvs"], universal_newlines=True
+        ).splitlines()
+    ]
+    tox_environments = [
+        line
+        for line in tox_environments
+        if line not in ["clean", "report", "docs", "check"]
     ]
-    tox_environments = [line for line in tox_environments if line not in ["clean", "report", "docs", "check"]]
 
     for name in os.listdir(join("ci", "templates")):
         with open(join(base_path, name), "w") as fh:
diff --git a/docs/conf.py b/docs/conf.py
@@ -18,17 +18,17 @@
     "sphinx.ext.viewcode",
 ]
 if os.getenv("SPELLCHECK"):
-    extensions += "sphinxcontrib.spelling",
+    extensions += ("sphinxcontrib.spelling",)
     spelling_show_suggestions = True
     spelling_lang = "en_US"
 
 source_suffix = ".rst"
 master_doc = "index"
-project = 'mario_addons'
-year = '2019'
-author = 'Mario contributors'
+project = "mario_addons"
+year = "2019"
+author = "Mario contributors"
 copyright = "{0}, {1}".format(year, author)
-version = release = '0.1.0'
+version = release = "0.1.0"
 
 pygments_style = "trac"
 templates_path = ["."]
@@ -45,9 +45,7 @@
 html_use_smartypants = True
 html_last_updated_fmt = "%b %d, %Y"
 html_split_index = False
-html_sidebars = {
-   "**": ["searchbox.html", "globaltoc.html", "sourcelink.html"],
-}
+html_sidebars = {"**": ["searchbox.html", "globaltoc.html", "sourcelink.html"]}
 html_short_title = "%s-%s" % (project, version)
 
 napoleon_use_ivar = True
diff --git a/setup.cfg b/setup.cfg
@@ -31,7 +31,7 @@ default_section = THIRDPARTY
 forced_separate = test_mario_addons
 not_skip = __init__.py
 skip = migrations
-known_third_party=pytest,click[check-manifest]
+known_third_party=click,requests,setuptools
 ignore =
   .flake8
   dev-requirements.in
diff --git a/setup.py b/setup.py
@@ -18,11 +18,11 @@
 
 def read(*names, **kwargs):
     with io.open(
-        join(dirname(__file__), *names),
-        encoding=kwargs.get("encoding", "utf8")
+        join(dirname(__file__), *names), encoding=kwargs.get("encoding", "utf8")
     ) as fh:
         return fh.read()
 
+
 try:
     with open("requirements.in") as f:
         INSTALL_REQUIRES = f.read().splitlines()
@@ -34,13 +34,16 @@ def read(*names, **kwargs):
 setup(
     name="mario-addons",
     version="0.1.0",
-    description='More commands for Mario.',
-    long_description="%s\n%s" % (
-        re.compile("^.. start-badges.*^.. end-badges", re.M | re.S).sub("", read("README.rst")),
-        re.sub(":[a-z]+:`~?(.*?)`", r"``\1``", read("CHANGELOG.rst"))
+    description="More commands for Mario.",
+    long_description="%s\n%s"
+    % (
+        re.compile("^.. start-badges.*^.. end-badges", re.M | re.S).sub(
+            "", read("README.rst")
+        ),
+        re.sub(":[a-z]+:`~?(.*?)`", r"``\1``", read("CHANGELOG.rst")),
     ),
-    author='Mario contributors',
-    author_email='email@example.com',
+    author="Mario contributors",
+    author_email="email@example.com",
     url="https://github.com/python-mario/mario-addons",
     packages=find_packages("src"),
     package_dir={"": "src"},
@@ -71,16 +74,12 @@ def read(*names, **kwargs):
         # eg: "keyword1", "keyword2", "keyword3",
     ],
     install_requires=INSTALL_REQUIRES
-        # eg: "aspectlib==1.1.1", "six>=1.7",
+    # eg: "aspectlib==1.1.1", "six>=1.7",
     ,
     extras_require={
         # eg:
         #   "rst": ["docutils>=0.11"],
         #   ":python_version=="2.6"": ["argparse"],
     },
-    entry_points={
-        "console_scripts": [
-            "mario-addons = mario_addons.cli:cli",
-        ]
-    },
+    entry_points={"console_scripts": ["mario-addons = mario_addons.cli:cli"]},
 )
diff --git a/src/mario_addons/__main__.py b/src/mario_addons/__main__.py
@@ -10,5 +10,6 @@
 """
 import mario_addons.cli
 
+
 if __name__ == "__main__":
     mario_addons.cli.cli()
diff --git a/src/mario_addons/cli.py b/src/mario_addons/cli.py
@@ -18,6 +18,7 @@
 
 from mario_addons import app
 
+
 @click.command()
 def cli(**kwargs):
     app.main(**kwargs)
diff --git a/tests/test_mario_addons.py b/tests/test_mario_addons.py
@@ -1,4 +1,3 @@
-
 from click.testing import CliRunner
 
 from mario_addons.cli import main
diff --git a/tox.ini b/tox.ini
@@ -79,4 +79,3 @@ commands =
 commands = coverage erase
 skip_install = true
 deps = coverage
-

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of`
`6`	`6`
`7`	`7`	`The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.`
`8`	`8`
`9`		`-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.`
	`9`	`+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.`