From 8734cba4b603a9a4738db4d6b1b2e80acda230d7 Mon Sep 17 00:00:00 2001 From: Harold Martin Date: Mon, 10 Feb 2020 12:02:49 -0800 Subject: [PATCH] additional linting plugins --- .flake8 | 2 +- Pipfile | 34 +++--- Pipfile.lock | 227 +++++++++++++++++++++++++++++++++++++---- pytube/cli.py | 1 + pytube/extract.py | 1 - tests/test_captions.py | 1 + tests/test_extract.py | 1 - tests/test_query.py | 2 +- tests/test_request.py | 1 - tests/test_streams.py | 1 - 10 files changed, 235 insertions(+), 36 deletions(-) diff --git a/.flake8 b/.flake8 index da1d4e6e3..f67b737b5 100644 --- a/.flake8 +++ b/.flake8 @@ -1,5 +1,5 @@ [flake8] -ignore = E231,E203,W503,Q000,WPS111,WPS305,WPS348,WPS602,D400,DAR201,S101,DAR101,C812,D104,I001,WPS306,WPS214,D401,WPS229,WPS420,WPS230,WPS414,WPS114,WPS226,WPS442,C819,WPS601,T001,RST304,WPS410,WPS428,A003,A002,I003,WPS221,WPS326,WPS201,S405,DAR301,WPS210,WPS202,WPS213,WPS301,P103,WPS407,WPS432,WPS211 +ignore = E231,E203,W503,Q000,WPS111,WPS305,WPS348,WPS602,D400,DAR201,S101,DAR101,C812,D104,I001,WPS306,WPS214,D401,WPS229,WPS420,WPS230,WPS414,WPS114,WPS226,WPS442,C819,WPS601,T001,RST304,WPS410,WPS428,A003,A002,I003,WPS221,WPS326,WPS201,S405,DAR301,WPS210,WPS202,WPS213,WPS301,P103,WPS407,WPS432,WPS211,S314,S310,S001,IF100,PT001 max-line-length = 89 [isort] diff --git a/Pipfile b/Pipfile index 11463d5a6..66dfa7530 100644 --- a/Pipfile +++ b/Pipfile @@ -7,21 +7,31 @@ name = "pypi" typing_extensions = "*" [dev-packages] -"flake8" = "*" -pytest = "*" -pytest-mock = "*" -pre-commit = "*" -pytest-cov = "*" -coveralls = "*" -sphinx_rtd_theme = "*" -mypy = "*" black = "==19.10b0" codecov = "*" +coveralls = "*" +flake8 = "*" +flake8-breakpoint = "*" +flake8-broken-line = "*" flake8-bugbear ="*" +flake8-builtins = "*" flake8-comprehensions ="*" flake8-eradicate = "*" -flake8-broken-line = "*" -pep8-naming = "*" -flake8-string-format = "*" +flake8-executable = "*" +flake8-if-expr = "*" +flake8-isort = "*" +flake8-logging-format = "*" +flake8-print = "*" +flake8-pytest = "*" +flake8-pytest-style = "*" flake8-quotes = "*" -pytest-profiling = "*" \ No newline at end of file +flake8-return = "*" +flake8-string-format = "*" +mypy = "*" +pep8-naming = "*" +pre-commit = "*" +pytest = "*" +pytest-cov = "*" +pytest-mock = "*" +pytest-profiling = "*" +sphinx_rtd_theme = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 1b0026cad..69f095d8d 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "0629e09fdb8ed76958e7c4894088cd7269e2edb4403488c990b34fc041a272d3" + "sha256": "75db0d3ce74eb73cbebc67bedd6754c46ef00ae20287eec86d1940096b8f1f10" }, "pipfile-spec": 6, "requires": {}, @@ -77,10 +77,10 @@ }, "cfgv": { "hashes": [ - "sha256:edb387943b665bf9c434f717bf630fa78aecd53d5900d2e05da6ad6048553144", - "sha256:fbd93c9ab0a523bf7daec408f3be2ed99a980e20b2d19b50fc184ca6b820d289" + "sha256:04b093b14ddf9fd4d17c53ebfd55582d27b76ed30050193c14e560770c5360eb", + "sha256:f22b426ed59cd2ab2b54ff96608d846c33dfb8766a67f0b4a6ce130ce244414f" ], - "version": "==2.0.1" + "version": "==3.0.0" }, "chardet": { "hashes": [ @@ -168,6 +168,19 @@ ], "version": "==0.3" }, + "eradicate": { + "hashes": [ + "sha256:4ffda82aae6fd49dfffa777a857cb758d77502a1f2e0f54c9ac5155a39d2d01a" + ], + "version": "==1.0" + }, + "filelock": { + "hashes": [ + "sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59", + "sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836" + ], + "version": "==3.0.12" + }, "flake8": { "hashes": [ "sha256:45681a117ecc81e870cbf1262835ae4af5e7a8b08e40b944a8a6e6b895914cfb", @@ -176,6 +189,151 @@ "index": "pypi", "version": "==3.7.9" }, + "flake8-breakpoint": { + "hashes": [ + "sha256:27e0cb132647f9ef348b4a3c3126e7350bedbb22e8e221cd11712a223855ea0b", + "sha256:5bc70d478f0437a3655d094e1d2fca81ddacabaa84d99db45ad3630bf2004064" + ], + "index": "pypi", + "version": "==1.1.0" + }, + "flake8-broken-line": { + "hashes": [ + "sha256:30378a3749911e453d0a9e03204156cbbd35bcc03fb89f12e6a5206e5baf3537", + "sha256:7721725dce3aeee1df371a252822f1fcecfaf2766dcf5bac54ee1b3f779ee9d1" + ], + "index": "pypi", + "version": "==0.1.1" + }, + "flake8-bugbear": { + "hashes": [ + "sha256:a3ddc03ec28ba2296fc6f89444d1c946a6b76460f859795b35b77d4920a51b63", + "sha256:bd02e4b009fb153fe6072c31c52aeab5b133d508095befb2ffcf3b41c4823162" + ], + "index": "pypi", + "version": "==20.1.4" + }, + "flake8-builtins": { + "hashes": [ + "sha256:29bc0f7e68af481d088f5c96f8aeb02520abdfc900500484e3af969f42a38a5f", + "sha256:c44415fb19162ef3737056e700d5b99d48c3612a533943b4e16419a5d3de3a64" + ], + "index": "pypi", + "version": "==1.4.2" + }, + "flake8-comprehensions": { + "hashes": [ + "sha256:d08323aa801aef33477cd33f2f5ce3acb1aafd26803ab0d171d85d514c1273a2", + "sha256:e7db586bb6eb95afdfd87ed244c90e57ae1352db8ef0ad3012fca0200421e5df" + ], + "index": "pypi", + "version": "==3.2.2" + }, + "flake8-eradicate": { + "hashes": [ + "sha256:b0bcdbb70a489fb799f9ee11fefc57bd0d3251e1ea9bdc5bf454443cccfd620c", + "sha256:b693e9dfe6da42dbc7fb75af8486495b9414d1ab0372d15efcf85a2ac85fd368" + ], + "index": "pypi", + "version": "==0.2.4" + }, + "flake8-executable": { + "hashes": [ + "sha256:968618c475a23a538ced9b957a741b818d37610838f99f6abcea249e4de7c9ec", + "sha256:a636ff78b14b63b1245d1c4d509db2f6ea0f2e27a86ee7eb848f3827bef7e16d" + ], + "index": "pypi", + "version": "==2.0.3" + }, + "flake8-if-expr": { + "hashes": [ + "sha256:173f6ceefdecbff532180aafe0360f6d1dd4da8b4a9b10193ddc1781291d580e", + "sha256:890c5bd0103c864492e7088bfaf4f9f5a987c336b03b2b285178456d08db3025" + ], + "index": "pypi", + "version": "==1.0.0" + }, + "flake8-isort": { + "hashes": [ + "sha256:64454d1f154a303cfe23ee715aca37271d4f1d299b2f2663f45b73bff14e36a9", + "sha256:aa0c4d004e6be47e74f122f5b7f36554d0d78ad8bf99b497a460dedccaa7cce9" + ], + "index": "pypi", + "version": "==2.8.0" + }, + "flake8-logging-format": { + "hashes": [ + "sha256:ca5f2b7fc31c3474a0aa77d227e022890f641a025f0ba664418797d979a779f8" + ], + "index": "pypi", + "version": "==0.6.0" + }, + "flake8-plugin-utils": { + "hashes": [ + "sha256:1ac5eb19773d5c7fdde60b0d901ae86be9c751bf697c61fdb6609b86872f3c6e", + "sha256:24b4a3b216ad588951d3d7adef4645dcb3b32a33b878e03baa790b5a66bf3a73" + ], + "version": "==1.0.0" + }, + "flake8-polyfill": { + "hashes": [ + "sha256:12be6a34ee3ab795b19ca73505e7b55826d5f6ad7230d31b18e106400169b9e9", + "sha256:e44b087597f6da52ec6393a709e7108b2905317d0c0b744cdca6208e670d8eda" + ], + "version": "==1.0.2" + }, + "flake8-print": { + "hashes": [ + "sha256:324f9e59a522518daa2461bacd7f82da3c34eb26a4314c2a54bd493f8b394a68" + ], + "index": "pypi", + "version": "==3.1.4" + }, + "flake8-pytest": { + "hashes": [ + "sha256:61686128a79e1513db575b2bcac351081d5a293811ddce2d5dfc25e8c762d33e", + "sha256:b4d6703f7d7b646af1e2660809e795886dd349df11843613dbe6515efa82c0f3" + ], + "index": "pypi", + "version": "==1.3" + }, + "flake8-pytest-style": { + "hashes": [ + "sha256:1c2303998c509cd65c3fb047cd536787ddf953e8113bc7f086c0cd7468db4b1f", + "sha256:820503cb50b7f6aa13a9889f4c47ba35bbd666877a72ed138ae5682a9bccaf9d" + ], + "index": "pypi", + "version": "==0.1.3" + }, + "flake8-quotes": { + "hashes": [ + "sha256:11a15d30c92ca5f04c2791bd7019cf62b6f9d3053eb050d02a135557eb118bfc" + ], + "index": "pypi", + "version": "==2.1.1" + }, + "flake8-return": { + "hashes": [ + "sha256:03b920cf2784370af4447a754fb7133ce165a6ecf6d4f506a95c4032ece48d8a", + "sha256:a219b619cdca3cd07dae150772f21083a11ce5280e2198acbac82bd9be0f574f" + ], + "index": "pypi", + "version": "==1.1.1" + }, + "flake8-string-format": { + "hashes": [ + "sha256:68ea72a1a5b75e7018cae44d14f32473c798cf73d75cbaed86c6a9a907b770b2", + "sha256:774d56103d9242ed968897455ef49b7d6de272000cfa83de5814273a868832f1" + ], + "index": "pypi", + "version": "==0.2.3" + }, + "gprof2dot": { + "hashes": [ + "sha256:b43fe04ebb3dfe181a612bbfc69e90555b8957022ad6a466f0308ed9c7f22e99" + ], + "version": "==2019.11.30" + }, "identify": { "hashes": [ "sha256:1222b648251bdcb8deb240b294f450fbf704c7984e08baa92507e4ea10b436d5", @@ -205,12 +363,22 @@ "markers": "python_version < '3.8'", "version": "==1.5.0" }, + "isort": { + "extras": [ + "pyproject" + ], + "hashes": [ + "sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1", + "sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd" + ], + "version": "==4.3.21" + }, "jinja2": { "hashes": [ - "sha256:6e7a3c2934694d59ad334c93dd1b6c96699cf24c53fdb8ec848ac6b23e685734", - "sha256:d6609ae5ec3d56212ca7d802eda654eaf2310000816ce815361041465b108be4" + "sha256:93187ffbc7808079673ef52771baa950426fd664d3aad1d0fa3e95644360e250", + "sha256:b0eaf100007721b5c16c1fc1eecb87409464edc10469ddc9a22a27a99123be49" ], - "version": "==2.11.0" + "version": "==2.11.1" }, "markupsafe": { "hashes": [ @@ -293,9 +461,9 @@ }, "nodeenv": { "hashes": [ - "sha256:561057acd4ae3809e665a9aaaf214afff110bbb6a6d5c8a96121aea6878408b3" + "sha256:5b2438f2e42af54ca968dd1b374d14a1194848955187b0e5e4be1f73813a5212" ], - "version": "==1.3.4" + "version": "==1.3.5" }, "packaging": { "hashes": [ @@ -311,6 +479,14 @@ ], "version": "==0.7.0" }, + "pep8-naming": { + "hashes": [ + "sha256:45f330db8fcfb0fba57458c77385e288e7a3be1d01e8ea4268263ef677ceea5f", + "sha256:a33d38177056321a167decd6ba70b890856ba5025f0a8eca6a3eda607da93caf" + ], + "index": "pypi", + "version": "==0.9.1" + }, "pluggy": { "hashes": [ "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0", @@ -385,6 +561,14 @@ "index": "pypi", "version": "==2.0.0" }, + "pytest-profiling": { + "hashes": [ + "sha256:93938f147662225d2b8bd5af89587b979652426a8a6ffd7e73ec4a23e24b7f29", + "sha256:999cc9ac94f2e528e3f5d43465da277429984a1c237ae9818f8cfd0b06acb019" + ], + "index": "pypi", + "version": "==1.7.0" + }, "pytz": { "hashes": [ "sha256:1c557d7d0e871de1f5ccd5833f60fb2550652da6be2693c1e02300743d21500d", @@ -457,10 +641,10 @@ }, "sphinx": { "hashes": [ - "sha256:298537cb3234578b2d954ff18c5608468229e116a9757af3b831c2b2b4819159", - "sha256:e6e766b74f85f37a5f3e0773a1e1be8db3fcb799deb58ca6d18b70b0b44542a5" + "sha256:b3feeed2da588adabd0db5329a309f27317e98382122721511e901833d092028", + "sha256:fb2ce74c28154872757925edda0060b4c4102cdc86b8b30063f23399678de2ca" ], - "version": "==2.3.1" + "version": "==2.4.0" }, "sphinx-rtd-theme": { "hashes": [ @@ -512,6 +696,13 @@ ], "version": "==1.1.3" }, + "testfixtures": { + "hashes": [ + "sha256:76eef0c048d6c1ad28bb74ae2b28fa9e3ea3a2f42a56715a4102480b8188e588", + "sha256:c352760016f0e5579a3e5565387e6d582ccad4db9791b6a293fdfc59d4591b97" + ], + "version": "==6.12.0" + }, "toml": { "hashes": [ "sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", @@ -563,10 +754,10 @@ }, "virtualenv": { "hashes": [ - "sha256:0d62c70883c0342d59c11d0ddac0d954d0431321a41ab20851facf2b222598f3", - "sha256:55059a7a676e4e19498f1aad09b8313a38fcc0cdbe4fdddc0e9b06946d21b4bb" + "sha256:09740201a02918564a84eea071708c46ac26f3bd9b688b48fc6a86f331c536b7", + "sha256:ef3fd938ef165956e51bba0d0623508de920ca9f3ccd30c6e9f74381677e0cbb" ], - "version": "==16.7.9" + "version": "==20.0.1" }, "wcwidth": { "hashes": [ @@ -577,10 +768,10 @@ }, "zipp": { "hashes": [ - "sha256:ccc94ed0909b58ffe34430ea5451f07bc0c76467d7081619a454bf5c98b89e28", - "sha256:feae2f18633c32fc71f2de629bfb3bd3c9325cd4419642b1f1da42ee488d9b98" + "sha256:5c56e330306215cd3553342cfafc73dda2c60792384117893f3a83f8a1209f50", + "sha256:d65287feb793213ffe11c0f31b81602be31448f38aeb8ffc2eb286c4f6f6657e" ], - "version": "==2.1.0" + "version": "==2.2.0" } } } diff --git a/pytube/cli.py b/pytube/cli.py index 15c03f67d..0da8992b6 100755 --- a/pytube/cli.py +++ b/pytube/cli.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# -*- coding: utf-8 -*- """A simple command line application to download youtube videos.""" import argparse diff --git a/pytube/extract.py b/pytube/extract.py index ed3a5cd42..0d1cd7d07 100644 --- a/pytube/extract.py +++ b/pytube/extract.py @@ -3,7 +3,6 @@ import json import re from collections import OrderedDict - from html.parser import HTMLParser from typing import Any, Optional, Tuple, List, Dict from urllib.parse import quote, parse_qs, unquote, parse_qsl diff --git a/tests/test_captions.py b/tests/test_captions.py index d4e0c7380..14794bdc9 100644 --- a/tests/test_captions.py +++ b/tests/test_captions.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from unittest import mock from unittest.mock import patch, mock_open, MagicMock diff --git a/tests/test_extract.py b/tests/test_extract.py index 2d9f362c0..f1ec4e5c2 100644 --- a/tests/test_extract.py +++ b/tests/test_extract.py @@ -3,7 +3,6 @@ import pytest from pytube.exceptions import RegexMatchError - from pytube import extract diff --git a/tests/test_query.py b/tests/test_query.py index 23ebd206e..c94cbc671 100644 --- a/tests/test_query.py +++ b/tests/test_query.py @@ -9,7 +9,7 @@ def test_count(cipher_signature): @pytest.mark.parametrize( - "test_input,expected", + ("test_input", "expected"), [ ({"progressive": True}, [18]), ({"resolution": "720p"}, [136, 247]), diff --git a/tests/test_request.py b/tests/test_request.py index 1026b8bdf..df39cfeb7 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- import os - from unittest import mock import pytest diff --git a/tests/test_streams.py b/tests/test_streams.py index 71ba7b766..0e8caaa32 100644 --- a/tests/test_streams.py +++ b/tests/test_streams.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import os import random - from unittest import mock from unittest.mock import MagicMock