From cd0ac3cb4f881407367aea67a178204e9a0e0f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksi=20Ha=CC=88kli?= Date: Tue, 15 Oct 2019 23:04:29 +0300 Subject: [PATCH] PEP8 formatting --- docs/conf.py | 81 ++++++++++++++------------------------- manage.py | 4 +- setup.py | 104 +++++++++++++++++++++++++-------------------------- 3 files changed, 82 insertions(+), 107 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 3eb0643..206e5b8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -12,42 +12,40 @@ from pkg_resources import get_distribution import django import sphinx_rtd_theme -environ.setdefault('DJANGO_SETTINGS_MODULE', 'axes.tests.settings') +environ.setdefault("DJANGO_SETTINGS_MODULE", "axes.tests.settings") django.setup() # -- Extra custom configuration ------------------------------------------ -title = 'django-axes documentation' -description = 'Keep track of failed login attempts in Django-powered sites.', +title = "django-axes documentation" +description = ("Keep track of failed login attempts in Django-powered sites.",) # -- General configuration ------------------------------------------------ # Add any Sphinx extension module names here, as strings. # They can be extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc'] +extensions = ["sphinx.ext.autodoc"] # Add any paths that contain templates here, relative to this directory. -templates_path = [ - '_templates', -] +templates_path = ["_templates"] # The suffix(es) of source filenames. # You can specify multiple suffix as a list of string: source_suffix = ['.rst', '.md'] -source_suffix = '.rst' +source_suffix = ".rst" # The master toctree document. -master_doc = 'index' +master_doc = "index" # General information about the project. -project = 'django-axes' -copyright = '2016, Jazzband' -author = 'Jazzband' +project = "django-axes" +copyright = "2016, Jazzband" +author = "Jazzband" # The full version, including alpha/beta/rc tags. -release = get_distribution('django-axes').version +release = get_distribution("django-axes").version # The short X.Y version. -version = '.'.join(release.split('.')[:2]) +version = ".".join(release.split(".")[:2]) # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -58,12 +56,10 @@ language = None # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. -exclude_patterns = [ - '_build', -] +exclude_patterns = ["_build"] # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = "sphinx" # If true, `todo` and `todoList` produce output, else they produce nothing. todo_include_todos = False @@ -72,7 +68,7 @@ todo_include_todos = False # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'sphinx_rtd_theme' +html_theme = "sphinx_rtd_theme" # Add any paths that contain custom themes here, relative to this directory. html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] @@ -80,55 +76,34 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +html_static_path = ["_static"] # Custom sidebar templates, maps document names to template names. html_sidebars = { - '**': [ - 'globaltoc.html', - 'relations.html', - 'sourcelink.html', - 'searchbox.html', - ], + "**": ["globaltoc.html", "relations.html", "sourcelink.html", "searchbox.html"] } # Output file base name for HTML help builder. -htmlhelp_basename = 'DjangoAxesdoc' +htmlhelp_basename = "DjangoAxesdoc" # -- Options for LaTeX output --------------------------------------------- latex_elements = { - 'papersize': 'a4paper', - 'pointsize': '12pt', - 'preamble': '', - 'figure_align': 'htbp', + "papersize": "a4paper", + "pointsize": "12pt", + "preamble": "", + "figure_align": "htbp", } # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto, manual, or own class]). -latex_documents = [ - ( - master_doc, - 'DjangoAxes.tex', - title, - author, - 'manual', - ), -] +latex_documents = [(master_doc, "DjangoAxes.tex", title, author, "manual")] # -- Options for manual page output --------------------------------------- # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). -man_pages = [ - ( - master_doc, - 'djangoaxes', - description, - [author], - 1, - ), -] +man_pages = [(master_doc, "djangoaxes", description, [author], 1)] # -- Options for Texinfo output ------------------------------------------- @@ -137,11 +112,11 @@ man_pages = [ texinfo_documents = [ ( master_doc, - 'DjangoAxes', + "DjangoAxes", title, author, - 'DjangoAxes', + "DjangoAxes", description, - 'Miscellaneous', - ), + "Miscellaneous", + ) ] diff --git a/manage.py b/manage.py index abb00c0..b2cf6bd 100644 --- a/manage.py +++ b/manage.py @@ -3,8 +3,8 @@ import os import sys -if __name__ == '__main__': - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'axes.tests.settings') +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "axes.tests.settings") from django.core.management import execute_from_command_line diff --git a/setup.py b/setup.py index 222a7a3..def2f8e 100644 --- a/setup.py +++ b/setup.py @@ -3,64 +3,64 @@ from setuptools import setup, find_packages setup( - name='django-axes', - description='Keep track of failed login attempts in Django-powered sites.', - long_description='\n'.join([ - open('README.rst', encoding='utf-8').read(), - open('CHANGES.rst', encoding='utf-8').read(), - ]), - keywords='authentication django pci security', - author=', '.join([ - 'Josh VanderLinden', - 'Philip Neustrom', - 'Michael Blume', - 'Alex Clark', - 'Camilo Nova', - 'Aleksi Hakli', - ]), - author_email='security@jazzband.co', - maintainer='Jazzband', - maintainer_email='security@jazzband.co', - url='https://github.com/jazzband/django-axes', + name="django-axes", + description="Keep track of failed login attempts in Django-powered sites.", + long_description="\n".join( + [ + open("README.rst", encoding="utf-8").read(), + open("CHANGES.rst", encoding="utf-8").read(), + ] + ), + keywords="authentication django pci security", + author=", ".join( + [ + "Josh VanderLinden", + "Philip Neustrom", + "Michael Blume", + "Alex Clark", + "Camilo Nova", + "Aleksi Hakli", + ] + ), + author_email="security@jazzband.co", + maintainer="Jazzband", + maintainer_email="security@jazzband.co", + url="https://github.com/jazzband/django-axes", project_urls={ - 'Documentation': 'https://django-axes.readthedocs.io/', - 'Source': 'https://github.com/jazzband/django-axes', - 'Tracker': 'https://github.com/jazzband/django-axes/issues', + "Documentation": "https://django-axes.readthedocs.io/", + "Source": "https://github.com/jazzband/django-axes", + "Tracker": "https://github.com/jazzband/django-axes/issues", }, - license='MIT', - package_dir={'axes': 'axes'}, + license="MIT", + package_dir={"axes": "axes"}, use_scm_version=True, - setup_requires=['setuptools_scm'], - python_requires='~=3.6', - install_requires=[ - 'django>=1.11', - 'django-appconf>=1.0.3', - 'django-ipware>=2.0.2', - ], + setup_requires=["setuptools_scm"], + python_requires="~=3.6", + install_requires=["django>=1.11", "django-appconf>=1.0.3", "django-ipware>=2.0.2"], include_package_data=True, packages=find_packages(), classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Web Environment', - 'Environment :: Plugins', - 'Framework :: Django', - 'Framework :: Django :: 1.11', - 'Framework :: Django :: 2.1', - 'Framework :: Django :: 2.2', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: MIT License', - 'Operating System :: OS Independent', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: Implementation :: CPython', - 'Programming Language :: Python :: Implementation :: PyPy', - 'Topic :: Internet :: Log Analysis', - 'Topic :: Security', - 'Topic :: System :: Logging', + "Development Status :: 5 - Production/Stable", + "Environment :: Web Environment", + "Environment :: Plugins", + "Framework :: Django", + "Framework :: Django :: 1.11", + "Framework :: Django :: 2.1", + "Framework :: Django :: 2.2", + "Intended Audience :: Developers", + "Intended Audience :: System Administrators", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: Implementation :: CPython", + "Programming Language :: Python :: Implementation :: PyPy", + "Topic :: Internet :: Log Analysis", + "Topic :: Security", + "Topic :: System :: Logging", ], zip_safe=False, )